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:
1b5be51
f8590d1
)
Merge "Clarify docs, sanity check roaming state." am: 419ec05284 am: 63b5615b2a
author
Jeff Sharkey
<jsharkey@android.com>
Mon, 27 Nov 2017 21:48:46 +0000
(21:48 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 27 Nov 2017 21:48:46 +0000
(21:48 +0000)
am:
f8590d1f79
Change-Id: I59fbe09afc74e94e2f56cb6fd833fc2deb7023e5
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge