merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
tree: d032d015cffc5cfed89dc585ea14286846d2a568
  1. androidtestlib/
  2. uiautomator/
  3. .gitignore
  4. Android.mk
  5. MODULE_LICENSE_APACHE2