Merge "Automated g4 rollback of changelist 158923709."
tree: c14e042b758595259c7829bbf384a251cad27541
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE