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

Change-Id: Ic31dc4ee58e67a464ce1685d40b63cbbc0f15864
tree: 26c5d65b9ebc3f607c24828dde62a0a9324ec124
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml