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