commit | 3939d6abf2a4b514e322c1c669da97614ac4510a | [log] [tgz] |
---|---|---|
author | Zoltan Szatmary-Ban <szatmz@google.com> | Tue Nov 25 15:08:08 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:08 2014 +0000 |
tree | cfc4dabf05af2268cc0c3bb773939e8a7a315809 | |
parent | 0da89b76402816dade084166a97b1d352ae1f78b [diff] | |
parent | 8e55c4bff83af7eea3212bc9ff6a254ac70139fd [diff] |
am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev * commit '8e55c4bff83af7eea3212bc9ff6a254ac70139fd': Add new subcommand 'set-active-admin' to the dpm command.