Reconcile with jb-mr1-release - do not merge

Change-Id: I23eff659df50eda339492319a1d92c11558f34a4
tree: 1d7acad4264c41a942328475ccea837b804b6f45
  1. res/
  2. sample/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml