Merge changes Ifa8ebcd5,I25e0f431 am: 6f46d80593 am: b3491f9095
am: 061676fe81

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