Merge changes I6af1fc7d,I0627d54a
am: 03249752af

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