OSDN Git Service

Merge "Fix NPE in NsdServiceTest" am: 60d5390f7a
authorHugo Benichi <hugobenichi@google.com>
Thu, 28 Sep 2017 12:28:44 +0000 (12:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Sep 2017 12:28:44 +0000 (12:28 +0000)
am: f9422cc65b

Change-Id: I2c88d81081c7994d42eb2715f29233817730201d


Trivial merge