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:
6210be1
e20bfea
)
Merge "Make interface IP serving code set LinkProperties" into oc-dr1-dev
author
Erik Kline
<ek@google.com>
Tue, 20 Jun 2017 06:10:43 +0000
(06:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Jun 2017 06:10:43 +0000
(06:10 +0000)
am:
e20bfea3d7
-s ours
Change-Id: I22b127879df9469fd63140d3b4466e859028eac0
Trivial merge