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