| commit | c89b1f0a42aa36359ebf17193e79dd3eb5fb80ea | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Aug 15 12:38:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 12:38:41 2014 +0000 |
| tree | 91daff86bd10042e19eb207e550946b4e3ce0c4e | |
| parent | 0d2e54523542e44d8f94dfdf0d1f2221ad062919 [diff] | |
| parent | bdc78678dedc6b66b9584948b908cd8cf77c6b30 [diff] |
am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev * commit 'a7d930a070e53b4306034eab7ba315642f2591a4': Revert "Revert "Revert "Update Trusted Credentials screen in settings"""