Merge changes Iab543850,I305f8a0e
am: 5a6cb962ae

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