Skip to content
Commit 85da0a7d 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: 6b10a7a3

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



Change-Id: I0ae2c961670bff7b3654d7510d3254d5c3303a96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2b87df8 6b10a7a3
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