Merge changes If771fbea,Ib213cf3c am: ce13778736
am: 4a27089552

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