| commit | 18aaf819ddbec4f2180c3feb49b02a5ca547953e | [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 | ef1562bc585184a187458c3cdffa3fce273ee8c5 | |
| parent | e39a89bab4d27eb89cc35d1209479dbba6dee3d0 [diff] | |
| parent | e179c18c8d5c2fb102a44619d9c3190a9326952a [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.