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