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:
9b85471
6d50b1a
)
Merge "make UpsreamNetworkMonitor the sole source of upstream network information...
author
Erik Kline
<ek@google.com>
Mon, 19 Jun 2017 08:50:49 +0000
(08:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Jun 2017 08:50:49 +0000
(08:50 +0000)
am:
6d50b1aefc
-s ours
Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f
Trivial merge