merge in jb-mr1-release history after reset to jb-mr1-dev
tree: b0cbc83943577246cfb40032a71f9d7f5c2a141b
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk