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