| commit | 2dfb494827a3b9d889e6e2b89626a57917add4e8 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Wed May 31 13:08:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 13:08:37 2017 +0000 |
| tree | 96a40213db4814b1d435f437722f2696e7270a62 | |
| parent | 6bc2199774d73f10dc87f74fe60b8ca7b59a2977 [diff] | |
| parent | f2383db7470308194030599d44f218befe602eed [diff] |
Merge "Fix race condition in NsdManagerTest" am: f2383db747 Change-Id: Ifd731767608e738a271bd5793a462675c2a93123