merge in jb-release history after reset to jb-dev
tree: 4832dddc26ca2c3342a3f62bbebb6704c34bf9bb
  1. java/
  2. res/
  3. tests/
  4. Android.mk