tree 03ae3bb1e34e87e770ef82cbf364eef433d1012d
parent 04e5f72cdb7bbe494e4b330b393388d1e0b18f74
parent 1386627335a79dd02fb34db344e63ca3abfce013
author Zoltan Szatmary-Ban <szatmz@google.com> 1407418791 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407197942 +0000

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