| commit | d7d06fed4063bf6e0c5f6c0fd216ac229d5b6ace | [log] [tgz] |
|---|---|---|
| author | Zoltan Szatmary-Ban <szatmz@google.com> | Fri Aug 15 14:44:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 14:44:23 2014 +0000 |
| tree | 43e28c8a38afba9aab1ecbb9f14a2b3cd47e08b6 | |
| parent | c4b3dfd1621176ff0b8628c557cf5b0cc90dd78d [diff] | |
| parent | b828e094c1d77892898a524009f82ad6559245ab [diff] |
am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev * commit 'bcdd58c572a81477a14c8a670739066783492bc3': Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""