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