OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ec2025 589afca)
DO NOT MERGE Store DNS server count in resolv_cache.
authorPierre Imai <imaipi@google.com>
Thu, 21 Apr 2016 06:50:43 +0000 (06:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 06:50:43 +0000 (06:50 +0000)
am: 589afca92c  -s ours

* commit '589afca92c2fa026f908ec2c54c0450c438c602c':
  DO NOT MERGE Store DNS server count in resolv_cache.

Change-Id: I1a640092bbadab367a2b413944336b32c2fc511e


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help