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:
e45651b
887fd90
)
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am:...
author
Etan Cohen
<etancohen@google.com>
Tue, 25 Apr 2017 13:40:42 +0000
(13:40 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Apr 2017 13:40:42 +0000
(13:40 +0000)
am:
887fd90742
Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/net/java/com/android/server/ConnectivityServiceTest.java
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/aware/WifiAwareManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc
tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge
diff --cc
wifi/java/android/net/wifi/aware/WifiAwareManager.java
Simple merge
OSDN Git Service
