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

Change-Id: I1a96613d0058bf7a86861a7d8e7a576ffd6e7cb1
tree: f6963754bee3000f47369d0fa4328ab49d6d4e1e
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/