| commit | 0be31e577bba88ca41e85cc58468571d8ba32653 | [log] [tgz] |
|---|---|---|
| author | Alexandra Gherghina <alexgherghina@google.com> | Fri Mar 20 23:12:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:28 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 92c07f8e760c41ac2506377e9ca651f82922e8e1 [diff] | |
| parent | a6bda47db5cea2ad52aa6038a03b224ddde28748 [diff] |
am a6bda47d: am 41aa08c3: am 00874018: Merge "Whitelist Settings app to keep in the managed profile" into lmp-dev * commit 'a6bda47db5cea2ad52aa6038a03b224ddde28748':