| commit | f174b5162664da2cb7f1e91c2b03324711540ba2 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Nov 12 14:51:06 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 12 14:51:06 2013 -0800 |
| tree | df63b42fb494546e58a0000b96230c1ea6b14ebe | |
| parent | c6a6539c27f1abe10948dfebcff1d1ac9712c7d3 [diff] | |
| parent | 48dab493b927f4a71687ccd557084ccee195de73 [diff] |
am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev * commit '48dab493b927f4a71687ccd557084ccee195de73': Fix inconsistency in reporting device admin active state.