OSDN Git Service

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
authorMichael Wright <michaelwr@google.com>
Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 May 2016 15:12:29 +0000 (15:12 +0000)
commitce290a75f26e3b9c6e2875ba1fcef65020984b7e
treeed9fec3ba2575db273cf06bf1ed951c3bcf24780
parentede05733f0c02f16324b71311397db5e680f607b
parenta1e0cebf3a18ac097d370e21d698e079f974bfff
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

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

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
api/current.txt
api/system-current.txt
api/test-current.txt
core/res/res/values/attrs.xml