am e74fd7a5: (-s ours) am 6a8af304: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'e74fd7a5cd8b9e62dea5fc0940c290699a7fa626':
Support test size annotations in android-test-lib.

Change-Id: I1c42da568bdb63e5fe74979a65e73c047c4aa4c5
am 5e6ca275: Cherry pick: Support test size annotations in android-test-lib.

* commit '5e6ca275201fea0fd0316fb15bc7d0248e224b2c':
  Cherry pick: Support test size annotations in android-test-lib.
am 3c941fb7: Pass the right Context object to AndroidTestCase and InjectContext.

* commit '3c941fb7233210b06245f52cd9630b33da15d344':
  Pass the right Context object to AndroidTestCase and InjectContext.
am 8e2184aa: Merge "Make TestRequestBuilder#build public." into jb-mr1-dev

* commit '8e2184aa915a4591f0a8fb6686bdb46eb06f510e':
  Make TestRequestBuilder#build public.
am e7ef2535: Use new display manager API.

* commit 'e7ef253585665720f73b8b2cefc591ffb3314a68':
  Use new display manager API.
am e0f20c45: Merge "Add support for \'logOnly\' mode." into jb-mr1-dev

* commit 'e0f20c452545312c4475539f27cebdebec54baa7':
  Add support for 'logOnly' mode.
am 0e239b8e: am cf21e179: am 50f012f5: Allow "click" logging to appear in logcat

* commit '0e239b8ef9eb013ef3334d87d0e503217c350b34':
  Allow "click" logging to appear in logcat
am 6b6adccb: Use ObjectNotFoundException in scroll methods

* commit '6b6adccb07300778cd665ca83c0e3672d97de41d':
  Use ObjectNotFoundException in scroll methods
am 36e79d18: am 17bc2a4f: am ddc1008f: UI Automator public API cleanup

* commit '36e79d180dad861a0a3fc9c208ab743f8e637947':
  UI Automator public API cleanup
am 963520b5: am 0061a9f1: am f612e6a0: more tweaks to visibility of methods, variables

* commit '963520b51fee9ae3ea039cab1bc7735da3a206e3':
  more tweaks to visibility of methods, variables
am c1be767b: (-s ours) am 9377caef: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'c1be767b01f7fb2e771fe0c5edac1448e747b9c2':
am d0e1637a: am 65d7dfd4: am 1a196a64: Logging clickAndWaitForNewWindow

* commit 'd0e1637a724f84502eceec9d13d042c94797ac48':
  Logging clickAndWaitForNewWindow
am d80b91de: Use new display manager API.

* commit 'd80b91ded7ae7e80da1c8466c554e8b03bdfb6b6':
  Use new display manager API.
am 16522ab7: Add support for annotation and notAnnotation args.

* commit '16522ab7fbaaa627c2c51cfc1339c2248af6df1b':
  Add support for annotation and notAnnotation args.
am 59b4c820: record rotation of display in XML dump, fix use of obsolete API

* commit '59b4c820f01d48a41d944239290028411528db25':
  record rotation of display in XML dump, fix use of obsolete API
am 6a6ac2e1: Don\'t use UiDevice in dump command

* commit '6a6ac2e1847fd2d2ce389e61ed723d81d6d2d229':
  Don't use UiDevice in dump command
am 7f38ef08: Clipped widget bounds reported outside screen bounds

* commit '7f38ef08d07295967b905a61b2356ff6cdf31159':
  Clipped widget bounds reported outside screen bounds
Reconcile with jb-mr1-release - do not merge

Change-Id: I970532420e4b825303d676208ee993305d6c4f86
am ae97c29c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ae97c29cf32ff90cc98e01c486abf33656a0eb7b':
  Don't use UiDevice in dump command