OSDN Git Service

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

Change-Id: I1f99a5fdcf2285a2579610d1eb0a946d21043e3d


Trivial merge