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:
c870528
7959e70
)
Merge "Fix up NetworkCapabilities' toString"
author
Chalard Jean
<jchalard@google.com>
Thu, 1 Mar 2018 05:48:14 +0000
(
05:48
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 1 Mar 2018 05:48:14 +0000
(
05:48
+0000)
am:
7959e70ef2
Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge