Merge changes I0e8549cf,I12ac7b89,I2c77f0c6,I3ba5795b am: 6cd92f57ee
am: 04570c6cc7

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