Merge changes Idb3f486e,I534e1d22
am: 38e05b7d25

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