commit | 3ad0c6ea3074fd1e68656d6b6151ae1098e02f21 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 03 01:49:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 03 01:49:04 2021 +0000 |
tree | 6052cec7794dc36f394969913d02448be3fc4d5d | |
parent | 855061cc02605de91fd594693a39b28ab51c05c6 [diff] | |
parent | 37643533d3a6f7c76ddf0d32b4524afcdff1be16 [diff] |
Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba am: 8dc3be6249 am: 37643533d3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557 Change-Id: Id5cd9e762b69b9edc8ea25d7259939a49b3f81b0