Merge changes Iaf6e217d,Ib22e33de,If9fd6ca9
am: 65aa3b3677

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