tree 16bbf7f072185d447c3f9f162858387ab9329171
parent 923427ee4034c81b381773b8664c162452c03532
parent a263edf14f67f098393311354fc424b710fae933
author Ricky Wai <rickywai@google.com> 1464716862 +0000
committer android-build-merger <android-build-merger@google.com> 1464716862 +0000

Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: f2ca8f9c50
am: a263edf14f

* commit 'a263edf14f67f098393311354fc424b710fae933':
  Do not get device owner admin info when device owner is null

Change-Id: Ibaad7c727c770fb98a077dff3d80ea0ba0f1e821