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