tree c35664a646fc50b033838dc8b7d6177d6c3c395e
parent dec9cdad734476c8cdbe5948d42e5d9534a5aaf2
parent 8a71cdaeb159af1bf851264c8ad5d037a705bcfa
author Amith Yamasani <yamasani@google.com> 1384297117 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384297117 -0800

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

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