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