diff options
| author | Nancy Zheng <nzheng@google.com> | 2016-09-29 18:32:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-29 18:32:55 +0000 |
| commit | b8ad282092c0c2f73f227eb783ef981f61b3b809 (patch) | |
| tree | 7984b9dce681e7c47aa6ba6033f9f0ad66d2a90c /tools/aapt2/diff/Diff.cpp | |
| parent | fc824eb16dd2339c154853b9f336a5d63383b2e6 (diff) | |
| parent | 2ab563ec6a572383b99cd90edbcaa310775e3be7 (diff) | |
Merge "Do not launch assistant via long press when device is locked." into cw-f-dev
am: 2ab563ec6a
Change-Id: I704706ad32b64c4b28ded7b6423300b78ae7762e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions