Reconcile with jb-mr2-release - do not merge

Change-Id: I237e3ce93b4ac39863d248d54690c71c08721aaf
tree: f0fe30e58399652523b050e047053d2bcf2ac9c1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. default.properties
  6. proguard.cfg