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:
5739596
287c334
)
Merge "Implement ConnectivityService TODO and fix many race conditions" am: f6b72dd14...
author
Hugo Benichi
<hugobenichi@google.com>
Thu, 21 Sep 2017 12:21:04 +0000
(12:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Sep 2017 12:21:04 +0000
(12:21 +0000)
am:
287c334379
Change-Id: Ia59d45f4e95a536d7982f61ac9c9a1bfc5e8ebb8
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge