Merge changes I14a2c0b6,Ic67566c2,Id0ef9164,Iec48f030,Ibe1f9de6, ...
am: 5f57e30484

Change-Id: Iabe5ea0bad0851164161c3552ee5354789292e83
tree: 457c9f3d377b3839c24f2e099b842ebcd3d6fb53
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE