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