tree 02cbf8421d6b998bf76e2b5b75cde48fc7904f41
parent 97339c256212c45705997d2283dad1fcec9a727e
parent 18aaf819ddbec4f2180c3feb49b02a5ca547953e
author Amith Yamasani <yamasani@google.com> 1384296799 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384296799 -0800

am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.