tree 1d3cac91f5cc2357a1f5533668082c1de8a40fcc
parent 4365a58dbf36b618601f786358719cd7e2bb70d1
parent 20ac22848f02ab78c2be42367722afc204d9774e
author Jorge Lucangeli Obes <jorgelo@google.com> 1437242033 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1437242034 +0000

Merge "Revert "Add 'Android.mk' file, fix compile on Android.""