Merge "Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 4695fae868" into nyc-mr1-dev-plus-aosp
am: a97ff704e5
* commit 'a97ff704e56ccd70f169f01a6ad639d4e2064afa':
Change-Id: Iffbc535f4e058bc29d97884240c6eab4cfa0e5f8
This commit is contained in: