tree f99378802acad780a137de82b61254b45ea781c9
parent 81a1217b71dadc72a60b476eeb23f5fda30e9381
parent d29ce6ae8c0ca96fcb63c0b730406e40a9bd065b
author Hugo Benichi <hugobenichi@google.com> 1493272187 +0000
committer android-build-merger <android-build-merger@google.com> 1493272187 +0000

Merge "NsdService: bootstrap unit tests" am: 7ca060aa95 am: dd53c962b2
am: d29ce6ae8c

Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60