| commit | a93fb72f85bbb12ede4d26f26fdc56457c0f8ee2 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Aug 15 13:40:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 13:40:22 2014 +0000 |
| tree | 42699b8a7f52265aa5a97632e4c29a8fba63c2af | |
| parent | 1982323f6569b99ac436e112d39b9b368d22a95a [diff] | |
| parent | bab1a3f396a103ccbd960c90a3808a2899591cb6 [diff] |
am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev * commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3': Revert "Revert "Revert "Update Trusted Credentials screen in settings"""