Merge "DO NOT MERGE"
tree: fb8c24ec8cd57ae9b185fbf6833b9af3b203bfe7
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle