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