tree cc106cf772232e5cdbe5fa58711532b62b3fd571
parent 4431d5ddf43445ee023f6e43608517911f6e0cb5
parent f94efbda865865b2fc7a394031f52c2568a37172
author Zoltan Szatmary-Ban <szatmz@google.com> 1408111706 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408077143 +0000

Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev