commit | 20c94a627ba2cafe379daa68839d0ae982d7fee6 | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Wed May 22 14:10:50 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 22 14:10:50 2013 -0700 |
tree | 0f69f89ba01b385cb30ab936aaded5ad4d8ec059 | |
parent | be6e37a7e8347e19e4cb8ae9d3d8f407b57c5c5e [diff] | |
parent | 1eb2064ff495b60bbf5db1a188adcad2e677742b [diff] |
am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev * commit '1eb2064ff495b60bbf5db1a188adcad2e677742b': Ensure all active Device Admins are listed.