tree 326582420e81e8ec2bfd8385f62ce98efa79bdb4
parent 359eca26c43171f8bf9abb5a5ce79a3784d73949
parent e575990583183fc804e1ff41e91dea8c7dd5decc
author Michael Wright <michaelwr@google.com> 1463670716 +0000
committer android-build-merger <android-build-merger@google.com> 1463670716 +0000

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: e575990583

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

Change-Id: Ida8e72342627123b0be5976236b5a2e0ca60db13