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