tree d57737ecbd76aac8d7ead42ccafc4325cb58fa9c
parent f587f5a54d4717c8f147ce46979f65f9301cd81d
parent d60861258169083f3174734af821fc8078ec5d2f
author Dianne Hackborn <hackbod@google.com> 1370546585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370546585 -0700

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

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