am d3c6acd5: Merge "Remove duplicate style" into klp-dev

* commit 'd3c6acd57cb92fbe7207749c4ad7e6e3deb81c9c':
  Remove duplicate style
tree: 48657b792911f35f6bf0db60ef525aa565cd6ff0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags