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:
c831316
5402b60
)
Merge "Add static IpClient logging" into pi-dev
author
android-build-team Robot
<android-build-team-robot@google.com>
Thu, 3 May 2018 08:30:22 +0000
(
01:30
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 3 May 2018 08:30:22 +0000
(
01:30
-0700)
am:
5402b60bfa
Change-Id: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
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