tree d3cdaa2fc5bc20b1180fcdd5c17f0c5a787b802c
parent 1d64812a35350692e0a770dcf278fab45ff855c8
parent f174b5162664da2cb7f1e91c2b03324711540ba2
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.