diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-27 21:57:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 21:57:23 +0000 |
| commit | 51589532efb97723d10dca829e56f4c014fa3b82 (patch) | |
| tree | 23775d8a0280412eff723c1341776e7e971380c3 /tools/aapt2/diff/Diff.cpp | |
| parent | 3a305bb3b890aa52e6f7f4b2019909f10680969e (diff) | |
| parent | ad4df34c139f33000e663d315bb2aaaa86305e1b (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
Change-Id: I8ed97b0e1b970c9ec019903563b568dd3a89a0e5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions