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)
1  2 
res/values/strings.xml

Simple merge