Merge changes Iab543850,I305f8a0e am: 5a6cb962ae am: c6f46340fb
am: 1c2cd22786

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