tree 51a4a29e37a405c745d7f8b7f256671d5f76b223
parent 9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c
parent 6d80d477391c6ad14a6bcdb044c3351de4e20481
author Dianne Hackborn <hackbod@google.com> 1370547051 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370547051 -0700

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

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