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