tree d2d3e54c9d9bfc2bffbbae86a937a4b05793de5b
parent 9bb5cef91f82f883a8899dee5fad56111648f1e1
parent b2905092d6779349834635c6343556017c0c998e
author Amith Yamasani <yamasani@google.com> 1418066150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418066150 +0000

am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner