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