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