OSDN Git Service

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

* commit 'f6d4090e3b2f1fe7edf45078a3c4b5aabd48249a':

Change-Id: If60b4b85e8af2112d00e4fe236b444a215ef8769


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help