commit | 8dc3be62499d439693e5d7b83509d237a0eac3ae | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 03 01:14:21 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 03 01:14:21 2021 +0000 |
tree | 8e48951b624fc9025a3cee0c34df2cc293a32332 | |
parent | 37a3ed2805828de1f021437b638b4512a6ca2b8e [diff] | |
parent | 00b14576baf95c57e4dc915dfdc00c1f25a39b95 [diff] |
Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557 Change-Id: I3929ce59312776fb513e9754eb7b24852ca82bbe