commit | f02b6357d0a21566fe354207069236eea08debfc | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 19 15:24:44 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 19 15:24:45 2016 +0000 |
tree | 5b6158d0176532d3e126ccb889d4c4567d0a863b | |
parent | 8225b077bc2c4112ea2a84edc7f0cb10722376f5 [diff] | |
parent | ecdff63f71dcfd9aed56faa7992ff7d40ec80880 [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