Merge changes If771fbea,Ib213cf3c
am: ce13778736

Change-Id: I542ecc5e2c7516c6033a02ac40381869fe4ff120
tree: 1db413d673a55fdb1576774d2fee381c98a83285
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE