tree 51a4a29e37a405c745d7f8b7f256671d5f76b223
parent f4b1aefbaafba7ba290a05bce84f77ee5ad5b043
parent 0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf
author Dianne Hackborn <hackbod@google.com> 1370546944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370546944 -0700

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

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