merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 26c5d65b9ebc3f607c24828dde62a0a9324ec124
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml