Merge changes Ib6415145,Ifde98a8c
am: 40a59d3070

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