diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-27 19:20:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-27 19:20:33 +0000 |
| commit | 436569bea2fedc1dc50959a6f702db255c8154db (patch) | |
| tree | 2ea3a390779a23c11812c7717d42268448bcf1eb /tools/aapt2/diff/Diff.cpp | |
| parent | 9589dca3080879d8a23b70fdfa6f85ef87f34e7b (diff) | |
| parent | 44ea155244d88bd146127480752db56fc722f2c0 (diff) | |
Merge changes from topic 'am-e324dcd33e36478aab5aff580c25af58' into cw-f-dev
* changes:
Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev am: afae61eae7
DozeService: Seperate double tap and pickup am: 7294c115fd
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions