diff options
| author | Michael Wright <michaelwr@google.com> | 2016-05-19 15:27:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 15:27:15 +0000 |
| commit | 367da1fbd7a174e0d3ba14da4353dc70d01c76e9 (patch) | |
| tree | 9b0a2b951f3f532e2ef86da257891863c82340c3 /docs/html/sdk/api_diff/20 | |
| parent | db4773f0df43da92ef5878e5c845552e251b3790 (diff) | |
| parent | 5d2ea237d428974be25e09ab9e11578cbf3bbc90 (diff) | |
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: 1831ca8f04
am: 5d2ea237d4 -s ours
* commit '5d2ea237d428974be25e09ab9e11578cbf3bbc90':
DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
Change-Id: I1f372c46e38f32cc6f7729c45fc385dead9b4434
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions