summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/20
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-19 15:24:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-19 15:24:45 +0000
commitaad6acaf6dcdc00abf12f5759c1a8d446e89f55e (patch)
tree4bf9efe2520a64831943b467ec870dbcdb78cb40 /docs/html/sdk/api_diff/20
parent5d2ea237d428974be25e09ab9e11578cbf3bbc90 (diff)
parentd308e46354e29e6954dcd67c5b9d0f5fbc7dad5f (diff)
Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: ce290a75f2" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions