OSDN Git Service

Merge "Fix broken trust agent reloading"
authorAdrian Roos <roosa@google.com>
Wed, 30 Apr 2014 15:51:47 +0000 (15:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Apr 2014 15:51:48 +0000 (15:51 +0000)

Trivial merge