| commit | 871e6759ac948aee51e1c1c5d65dde0adf5a2f0d | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Wed May 31 13:25:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 13:25:53 2017 +0000 |
| tree | 6f36319b09157b003fc7382fdc8763783b00e3ee | |
| parent | 380758a685a629ea77baa86e4b2f6b9538bd010e [diff] | |
| parent | ba82d646a6ae999a43ad58ec9f9df3af5d411905 [diff] |
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6 Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69