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