OSDN Git Service

Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
authorJim Miller <jaggies@google.com>
Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Aug 2014 22:25:16 +0000 (22:25 +0000)
commit1351b0fbcddea9cc66941e8af1de148142b92201
treee0655960500b9626c7e65c2f4091af62ed314289
parentd5ee3bc858f2e3c7e4dee6887c982c768c355c7a
parent9d25005e7ab39bcc14722f7bdb977ceccb6107dc
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
res/values/strings.xml