| commit | 2dcdbe8d60d1b0f53fb5ce9bfc18e94efaed1f9d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 05 14:20:02 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 05 14:20:04 2016 +0000 |
| tree | d8d55248f8de83858c444125541212dc189a4aae | |
| parent | be35e86ba81c72c6b5a2351fc03f19ee70393822 [diff] | |
| parent | ad7327805d1a9cfaa77186f15703c3e0a8b28c0d [diff] |
Merge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am: 27c6fb03d8" into nyc-mr1-dev-plus-aosp