OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2de9220
21bf063
)
DO NOT MERGE Add new info functions to resolver for use by Netd.
author
Pierre Imai
<imaipi@google.com>
Thu, 21 Apr 2016 07:05:57 +0000
(07:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Apr 2016 07:05:57 +0000
(07:05 +0000)
am:
21bf063727
-s ours
* commit '
21bf06372742b0524c358502eb692a2245d64dda
':
DO NOT MERGE Add new info functions to resolver for use by Netd.
Change-Id: Icfbf7659c99d45fdcffa9e096a605b8eed23515c
Trivial merge