Skip to content
Commit 7bdc4fcf authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge changes If401164b,I84949081 

* changes:
  Add missing flags to DPMS.
  add missed flag for getAccountTypesWithManagementDisabledAsUser
parents d8aa6daa 1314642d
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