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