merge in jb-mr1-factory-release history after reset to jb-mr1-dev
clickAndWaitForNew window fix

Change-Id: I09cd387f8b80f3d8d4f749856663f54f36f07158

Conflicts:

	uiautomator/library/src/com/android/uiautomator/core/InteractionController.java
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: If00d1cff6ddb12ee5aa6fa9d31ac509617b41682
am 08f500a9: And add support for multi events sync

* commit '08f500a92397522c48bcdad58d37ec1be95956d1':
  And add support for multi events sync
Reconcile with jb-mr1-release - do not merge

Change-Id: I557d1fb2c905a3a0586f6cbeacc6643fae95e02e
Fix scrollable start and end detection in ui automator.

Needed to change runAndWaitForEvent to plumb the AccessibilityEvent back
to the caller, but it's a private method, so it should be fine.
The determination for vertical or horizontal scrolling is a little bit
hackish, but there's no other way from within scrollSwipe.

Bug: 7461659
Change-Id: I3908440cd8cb6e9ee1c76f3fa4096f87107df6e4
am 0bb49719: Release API prep

* commit '0bb49719aab950cc522c2c56f7adce750c656012':
  Release API prep
Merge "Fix scrollable start and end detection in ui automator." into jb-mr1.1-dev
am be6e9948: API record keeping for UI Automator

* commit 'be6e99484bd8b20f51c8fbd6dce828802b020099':
  API record keeping for UI Automator
Merge from jb-mr1-dev

Change-Id: Ie038a8cd1499afdc78bf73672526481a15b3db94
Reconcile with jb-mr1-release - do not merge

Change-Id: I5fc6e005f72946dddf44edee653192441c5d8024
more Java doc tweaks

* annotate each public API with proper @since tag
* re-hide getDisplaySizeDp since we missed the launch window
* remove reference to getDisplaySizeDp in Java doc elsewhere

Change-Id: I25b5e461418e3cff72df685debecbc1d9620a1d5
am dbba7136: more Java doc tweaks

* commit 'dbba713661688a285e701a006ce2d199296ac328':
  more Java doc tweaks
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib87316bb7f659feda97ae83ee1bea3b056bc5249
fix API Level annotations, add pre-req for api change detection

* a couple of functions are in fact not available for API Level 16
* add a current.txt as a pre-req for API change checking, for
  starters, it'll be identical to 17.txt

Bug: 7538348
Bug: 7540265

Change-Id: Ib8a5c1854dd372fdf34ec3ecc334536e099e4038
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
am 79693ede: fix API Level annotations, add pre-req for api change detection

* commit '79693ede92636fe6f3a6ec4dc049a438fd9504ff':
  fix API Level annotations, add pre-req for api change detection
Support apicheck for uiautomator.

Bug: 7540265
Change-Id: I7343b533da0a3b0d6feab8d4d928170059a6c4df
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev