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