Merge changes Ib013b10f,I07563fd2
am: dc6e00fac8

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