OSDN Git Service

Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c
authorErik Kline <ek@google.com>
Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03


Trivial merge