Merge changes Ida554313,Ie7187b02,I7a7c23b4
am: ef7a7eb0f1

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