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