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:
74ab238
3e343ff
)
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
author
Robin Lee
<rgl@google.com>
Thu, 16 Jun 2016 10:10:23 +0000
(10:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Jun 2016 10:10:23 +0000
(10:10 +0000)
am:
3e343ffd91
Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
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