OSDN Git Service

Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
authorAdrian Roos <roosa@google.com>
Thu, 5 May 2016 14:19:35 +0000 (14:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 14:19:35 +0000 (14:19 +0000)
am: 27c6fb03d8

* commit '27c6fb03d8ab38c090e28a72aee1a4ccec514122':

Change-Id: Ib4c721e27ee0336758c1738e21766f5f08e88fcb


Trivial merge