tree b975b774e8591dff505a6b49124ef75919a50855
parent 24d5e1b9ec676eea4cb803f584dec3dadc170ab8
parent 90c9dbc91910a77b8660ec66de0725aee472e0ab
author Ricky Wai <rickywai@google.com> 1464715374 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464715375 +0000

Merge "Do not get device owner admin info when device owner is null" into nyc-dev