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:
4565fef
6f1b746
)
DO NOT MERGE Fix DNS search path info. am: 7574606
author
Pierre Imai
<imaipi@google.com>
Thu, 28 Apr 2016 02:11:00 +0000
(
02:11
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 28 Apr 2016 02:11:00 +0000
(
02:11
+0000)
am:
6f1b746
-s ours
* commit '
6f1b746169b1d95faa6b793a94d4fe10d90c43db
':
Change-Id: Ie7f53c09e74b96268e5942c74829e6b292137f86
Trivial merge