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:17:11 +0000 (14:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 14:17:11 +0000 (14:17 +0000)
commita74942e9a6ff32d391342036747be746e70126ec
treed8d55248f8de83858c444125541212dc189a4aae
parent7e3f6492a46355d58afb1cba6d88d61569703897
parent27c6fb03d8ab38c090e28a72aee1a4ccec514122
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
am: 27c6fb03d8

* commit '27c6fb03d8ab38c090e28a72aee1a4ccec514122':
  Fix Trust Agent discovery for FBE

Change-Id: I5cb87859e9717f6e73af54b3b79426577ec893b1