Reconcile with jb-mr2-release - do not merge

Change-Id: I6ae59824a2816429c9d8b2cf698a7170de89cef0
tree: ceff2eb90090b28f0df9b0c4ca7c10d521adea22
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags