am a795ab85: am c39ee474: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'a795ab8568293b45b8687398bb91ba906a264c19':
tree: 6fb727ccda1a7478567c1be879721b2c5addab07
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml