Skip to content
Commit 36c0b2d1 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

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



Change-Id: I3ac90eee3e63241e9ef73961b22b454db213ba42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c512353 2d31bbe7
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