Skip to content
Commit 3ad0c6ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576... 

Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576 am: 8dc3be62 am: 37643533

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557

Change-Id: Id5cd9e762b69b9edc8ea25d7259939a49b3f81b0
parents 855061cc 37643533
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment