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