OSDN Git Service

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

* commit 'be35e86ba81c72c6b5a2351fc03f19ee70393822':

Change-Id: I23a100019283215227e739957a3737ce405fe94f


Trivial merge