OSDN Git Service

am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than...
authorJim Miller <jaggies@google.com>
Fri, 22 Aug 2014 22:44:56 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 22:44:56 +0000 (22:44 +0000)
commit0c5fdd10dedf7c3671d19addcea270ed945b92d1
treed773e3768a6cd67dfae6f8a4ed36676ff1439251
parent76211390f23e8478327e41591df7b33c03eebe9f
parent86e9f7cd668441dff2a35b046a99ebe8fd0548d9
am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev

* commit '86e9f7cd668441dff2a35b046a99ebe8fd0548d9':
  Show trust agent entries as disabled rather than removing them.