OSDN Git Service

Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am: a4de8ee5ee
authorAdrian Roos <roosa@google.com>
Thu, 5 May 2016 14:19:37 +0000 (14:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 14:19:37 +0000 (14:19 +0000)
commite967dd3e325b16c7169152b644187449d6c5745f
tree53752b0bd2c46131df760331c31c88693c77330d
parent0aec1d8855588d4557b58af67fadc8c466d6f176
parent2ff2ac6a587d4557759b5d757f6132b5a0347316
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am: a4de8ee5ee
am: 2ff2ac6a58

* commit '2ff2ac6a587d4557759b5d757f6132b5a0347316':
  Fix Trust Agent discovery for FBE

Change-Id: I8142004b551a0dd646e4d4421cc22673a6e50aec