tree 91daff86bd10042e19eb207e550946b4e3ce0c4e
parent 0d2e54523542e44d8f94dfdf0d1f2221ad062919
parent bdc78678dedc6b66b9584948b908cd8cf77c6b30
author Narayan Kamath <narayan@google.com> 1408106321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408106321 +0000

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"""