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

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

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf am: 1831ca8f
am: 5d2ea237  -s ours

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

Change-Id: I1f372c46e38f32cc6f7729c45fc385dead9b4434
parents db4773f0 5d2ea237
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