| commit | 89aa554135b7e39ac4391af83955bae9d8b748b5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 03 02:07:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 03 02:07:22 2021 +0000 |
| tree | 1dbbf1f68ecf927e61052053bb338ff7be25908b | |
| parent | 8c02560d2b390ab345cad68d8700bb75929459d0 [diff] | |
| parent | 3ad0c6ea3074fd1e68656d6b6151ae1098e02f21 [diff] |
[automerger skipped] Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba am: 8dc3be6249 am: 37643533d3 am: 3ad0c6ea30 -s ours am skip reason: Merged-In I3fa20b53b929c97a6760d65b432a74c3415d6a08 with SHA-1 a07ccbe656 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557 Change-Id: I1b60ef45b1ee8ff2bc73bf14b8a865e798bd8854