| commit | ba82d646a6ae999a43ad58ec9f9df3af5d411905 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Wed May 31 13:16:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 13:16:43 2017 +0000 |
| tree | 4cff3ed5c229ca6c19015657561568a056a9efbe | |
| parent | 8274806df3136b56ef1b336fec099dcd6512f4f6 [diff] | |
| parent | 2dfb494827a3b9d889e6e2b89626a57917add4e8 [diff] |
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7