OSDN Git Service

Merge "Update Trusted Credentials screen in settings" into lmp-dev
authorZoltan Szatmary-Ban <szatmz@google.com>
Tue, 9 Sep 2014 11:05:54 +0000 (11:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Sep 2014 11:05:54 +0000 (11:05 +0000)

Trivial merge