| commit | 72b198508a3e2db38541e49a85229d363fdef3ae | [log] [tgz] |
|---|---|---|
| author | Zoltan Szatmary-Ban <szatmz@google.com> | Thu Nov 20 14:10:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 14:10:14 2014 +0000 |
| tree | c90ab62559d73e33684c8fcd3865bc9d7d2379a9 | |
| parent | 50c673660ef54242bcaefbf838e40d54bdaf6e84 [diff] | |
| parent | 548460bda5d37b22165b8e9e4e6349699910795a [diff] |
am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev * commit '548460bda5d37b22165b8e9e4e6349699910795a': Show managed profile accounts on Settings > Factory Reset