Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

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