| commit | 7db442e2bdf8b64efe34c1c8905668f38708ee8e | [log] [tgz] |
|---|---|---|
| author | Zoltan Szatmary-Ban <szatmz@google.com> | Fri Aug 15 13:40:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 13:40:33 2014 +0000 |
| tree | bc74227f4f302dfb97958cb59864e28f0df7e0a0 | |
| parent | a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2 [diff] | |
| parent | eb92dd23b9dd69853720cc30859acae6e9592d80 [diff] |
am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev * commit '08390bf9cb75bfb2987a480166d02f672afa8ba1': Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""