| commit | fc37e35e9c52b2e63f0141d93d858bc4ff78e3c0 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu May 19 15:33:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 15:33:47 2016 +0000 |
| tree | 1d8b2a4f03158d1ff924fe47239dc15305a0552d | |
| parent | edbd9cbdde960ca474b6dcf0e37234608fcd17f8 [diff] | |
| parent | f02b6357d0a21566fe354207069236eea08debfc [diff] |
Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: e575990583 am: ddd647da37" into nyc-mr1-dev-plus-aosp am: f02b6357d0 -s ours * commit 'f02b6357d0a21566fe354207069236eea08debfc': Change-Id: If5602cd2b0f3bfd5e181a5625d7188b62a0b3d64