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