Merge "Google Specific Settings" into klp-dev
tree: bde787ed54431a75900c38da44ac7f1ab7613641
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags