tree 51a4a29e37a405c745d7f8b7f256671d5f76b223
parent 33adccd203ee8303cd0bf489e3f072d362e1705d
parent f96a86c99d7505e15a39266967cf4d4d75295af1
author Dianne Hackborn <hackbod@google.com> 1370547166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370547166 -0700

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

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