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