tree ccc014a4be6f3fc6455e82dbdbba52136dbc91ae
parent f8ba37696e11f21c4ac4672ed47c306161a134c1
parent 4f48862d0f9514b260833d66640262742ca58f1d
author Hugo Benichi <hugobenichi@google.com> 1501565279 +0000
committer android-build-merger <android-build-merger@google.com> 1501565279 +0000

Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
am: 4f48862d0f  -s ours

Change-Id: I66aa7d2d7128272bedc04568dbdcb759a3be8afe