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:
7121e04
8982a81
)
Merge "Add OEM_PAID capability to system api" into pi-dev
author
Pavel Maltsev
<pavelm@google.com>
Fri, 30 Mar 2018 18:30:23 +0000
(18:30 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 30 Mar 2018 18:30:23 +0000
(18:30 +0000)
am:
8982a81f3c
Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
1
2
core/java/android/net/NetworkCapabilities.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/NetworkCapabilities.java
Simple merge