Merge changes Ida554313,Ie7187b02,I7a7c23b4 am: ef7a7eb0f1
am: 67bbb72fa5

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