Skip to content
Commit f3201c39 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into... 

Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf am: ce290a75" into nyc-mr1-dev-plus-aosp
am: aad6acaf  -s ours

* commit 'aad6acaf':

Change-Id: I468712ca8526c6624eaa2d620cfbd52dc9820d6f
parents 367da1fb aad6acaf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment