Skip to content
Commit 6107812d authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "DPMS workaround to check the device owner type in PermissionController"... 

Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7 am: 36c0b2d1

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



Change-Id: Iab524e7ab8bba033093c3a1aeb52d88f79e23581
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48fbc807 36c0b2d1
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