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