Merge changes Ib92b055d,I5c9f66ff
am: 4b46ec2258

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