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