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