tree 1c828c782c90d3e56a1daa45686db7ee5f471836
parent 0d52fc184defef46378e7ba095091c7bab1ee459
parent a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf
author Dianne Hackborn <hackbod@google.com> 1370547300 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370547300 -0700

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

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