Reconcile with jb-mr1.1-release - do not merge

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