OSDN Git Service

DO NOT MERGE Store DNS server count in resolv_cache. am: 589afca92c -s ours
authorPierre Imai <imaipi@google.com>
Thu, 21 Apr 2016 06:53:06 +0000 (06:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 06:53:06 +0000 (06:53 +0000)
am: 2de9220c5f  -s ours

* commit '2de9220c5f526a4a62c7ad541f2bfebc51ea5852':

Change-Id: Icdf65633b2fbd9631da379b8c89273d1c67b3506


Trivial merge