| commit | 067c12c8441076dfd4d88bd004662282d3ae790d | [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 | f588b49e650b50a60c2fc9d5b734962efa982783 | |
| parent | 1595d96117a677f4a600a23bf80e509c3f1b7310 [diff] | |
| parent | 4e0d0e2f7bc64bbd6795f66bd3d39e022b5769eb [diff] |
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6 Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69