Reconcile with jb-mr1-release - do not merge

Change-Id: Idcd07cb3ade256c19ffaf983b4f1298eb25d5698
tree: 6fb727ccda1a7478567c1be879721b2c5addab07
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml