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)
commita4de8ee5ee2a9024e9abf946027d18471db63fe0
tree2a1e2e2ac887ea79cabb486349e845906fe2c532
parent9a1cc86c35965477078f5b9a51d63e59b6577a9c
parent957df516f006129198847ff9448004c097e1be98
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am: 957df516f0

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

Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849