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:
3db7350
a1d90d9
)
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
author
Etan Cohen
<etancohen@google.com>
Tue, 25 Apr 2017 03:26:01 +0000
(
03:26
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 25 Apr 2017 03:26:07 +0000
(
03:26
+0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/test-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/aware/SubscribeConfig.java
patch
|
diff1
|
diff2
|
blob
|
history
wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
api/system-current.txt
Simple merge
diff --cc
api/test-current.txt
Simple merge
diff --cc
wifi/java/android/net/wifi/aware/SubscribeConfig.java
Simple merge
diff --cc
wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java
Simple merge