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