OSDN Git Service

Merge "Ensure trust agents are only provided by platform packages - DO NOT MERGE...
authorAdrian Roos <roosa@google.com>
Wed, 4 Jun 2014 21:43:46 +0000 (21:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jun 2014 21:43:47 +0000 (21:43 +0000)

Trivial merge