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:
8a8d4eb
b1e2bfe
)
Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
author
Pavel Maltsev
<pavelm@google.com>
Wed, 7 Mar 2018 23:09:04 +0000
(23:09 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 7 Mar 2018 23:09:04 +0000
(23:09 +0000)
am:
b1e2bfe4df
Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/net/java/android/net/NetworkCapabilitiesTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge
diff --cc
tests/net/java/android/net/NetworkCapabilitiesTest.java
Simple merge