Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: 3c570f9a12" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
d6f9056ff8