OSDN Git Service

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

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849


Trivial merge