Merge "Remove duplicate style" into klp-dev
tree: 33b4461252cc3d612f9512dda3d0be4f8053be73
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags