tree 4bf9efe2520a64831943b467ec870dbcdb78cb40
parent 073466ea8a25a94327f7d9e7a2cf9dd858d8d626
parent ce290a75f26e3b9c6e2875ba1fcef65020984b7e
author Michael Wright <michaelwr@google.com> 1463671438 +0000
committer android-build-merger <android-build-merger@google.com> 1463671438 +0000

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

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

Change-Id: I8df44a8cbc687f81639cb061fb6739a813f0c386