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