diff options
| author | Tony Mak <tonymak@google.com> | 2016-04-19 10:32:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-19 10:32:33 +0000 |
| commit | 882a0802a7f7268750b15adb8747dd3904f935b0 (patch) | |
| tree | cd77e71e27c1fb6cc7c2beada69d46f90dacbc17 /tools/aapt2/diff/Diff.cpp | |
| parent | bf8207e270b1af908278b7a58c33a3e16d425cac (diff) | |
| parent | 2c11dc99632354836281cbe3000b911e72a30d14 (diff) | |
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions