tree c9abbbb47c78c8d5cb22ed0d0d303caadd6848e2
parent 8638eeb4e925009fcc91fd9a9965740c25fe518a
parent 5f28c77bc64deb132082eaab0ebd544ba5111bd0
author Dianne Hackborn <hackbod@google.com> 1370546799 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370546799 -0700

am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way...

* commit '5f28c77bc64deb132082eaab0ebd544ba5111bd0':
  Fix issue #9074296: Device Admins can activate in a way...