| commit | 9de861247ff3a7142c33d8991e39ab830dee7cce | [log] [tgz] |
|---|---|---|
| author | Zoltan Szatmary-Ban <szatmz@google.com> | Wed Jan 07 12:56:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 12:56:03 2015 +0000 |
| tree | 3d0cb610accb4afde4361e5476b1312c99cd1a58 | |
| parent | 2abb36aaa68be047e2b5ee21d587f274c6721dea [diff] | |
| parent | c374175f61aff876f895cf15664ea66f54978aaf [diff] |
am c374175f: am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev * commit 'c374175f61aff876f895cf15664ea66f54978aaf': Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials