tree b5399bb0c341726d2eba4db0311c19e435cf45f9
parent 982daf8769bf78dd6bb240dab9ac7d0a62de21cc
parent 9a81a182df634ab7a087752c9a10db67c5d0f256
author Rubin Xu <rubinxu@google.com> 1438348544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438348544 +0000

am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev

* commit '9a81a182df634ab7a087752c9a10db67c5d0f256':
  Don't always transfer device owner status to other users.