Skip to content
Commit 37643533 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 am: 8dc3be62 

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

Change-Id: Ica48fc74b73c4d54f39fff315ecd8ffc03989e9a
parents f7f152ea 8dc3be62
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