OSDN Git Service

am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active...
authorAmith Yamasani <yamasani@google.com>
Tue, 12 Nov 2013 22:53:19 +0000 (14:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Nov 2013 22:53:19 +0000 (14:53 -0800)
* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.


Trivial merge