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