DO NOT MERGE reset to goog/klp-volantis-dev
tree: 137ef5bdef513b270a949271b453ce65bc0a95f1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags