diff options
| author | Michael Wright <michaelwr@google.com> | 2016-05-19 15:35:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 15:35:01 +0000 |
| commit | f3201c391101ddaa4d94c42343349ff2ef0ae74b (patch) | |
| tree | 9b0a2b951f3f532e2ef86da257891863c82340c3 /docs/html/sdk/api_diff/21/changes | |
| parent | 367da1fbd7a174e0d3ba14da4353dc70d01c76e9 (diff) | |
| parent | aad6acaf6dcdc00abf12f5759c1a8d446e89f55e (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
am: aad6acaf6d -s ours
* commit 'aad6acaf6dcdc00abf12f5759c1a8d446e89f55e':
Change-Id: I468712ca8526c6624eaa2d620cfbd52dc9820d6f
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions