OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba41013 fe3c378)
DO NOT MERGE Add new info functions to resolver for use by Netd. am: 21bf063727
authorPierre Imai <imaipi@google.com>
Thu, 21 Apr 2016 06:48:41 +0000 (06:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 06:48:41 +0000 (06:48 +0000)
am: fe3c378a38  -s ours

* commit 'fe3c378a38fd2f0fc3bd7641a576676fb1864f7c':
  DO NOT MERGE Add new info functions to resolver for use by Netd.

Change-Id: I521edae745c3768949a88fc813d381237e410f1b


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help