tree 1d8b2a4f03158d1ff924fe47239dc15305a0552d
parent 38aad8092e7950d734a5a60c0d43c572918c3d42
parent 8225b077bc2c4112ea2a84edc7f0cb10722376f5
author Michael Wright <michaelwr@google.com> 1463671996 +0000
committer android-build-merger <android-build-merger@google.com> 1463671996 +0000

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: e575990583 am: a2f5caf77e
am: 8225b077bc  -s ours

* commit '8225b077bc2c4112ea2a84edc7f0cb10722376f5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: If09ac1624b03b5c8583fc68df44c71d8acc85c75