merge in jb-mr0-release history after reset to jb-dev
tree: 17f785129cbd6f6b3dfc80eb47bd89dd1de483d7
  1. uiautomator/
  2. .gitignore
  3. Android.mk
  4. MODULE_LICENSE_APACHE2