merge in klp-release history after reset to klp-dev
tree: fbf0c12f8832d23b3282512d97259999e49ff3cc
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags