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