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

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