Skip to content
Commit ebf00fdc authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Always show lockdown button" into sc-dev am: 04697f82 am: b8abde22 

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

Change-Id: I09d2d90eb7c8cc86e0dab898956c34e02d5dd55d
parents 1ceb6502 b8abde22
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