Merge changes Icc92997c,I70c032fd,Ibafdaf5f,Ifd2efcc9,Iba5609ac
am: fd02ee3e69

Change-Id: Ieb52a50403bd2441b689970845f5b1e8014fc2db
tree: 81819cc9b9599d4c27dc14d5063c85d39921aaa7
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE