Merge changes Ib013b10f,I07563fd2 am: dc6e00fac8 am: 7e5cbfa851
am: fe6f39d4d9

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