OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1eb23ba
aed6ea5
)
Merge "Support query cancellation for async DNS API"
author
Luke Huang
<huangluke@google.com>
Fri, 22 Mar 2019 03:50:18 +0000
(20:50 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 22 Mar 2019 03:50:18 +0000
(20:50 -0700)
am:
aed6ea52de
Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge