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:
9e419d3
aa85acc
)
Merge "wifi: Params for SAR limits" into oc-dr1-dev
author
Roshan Pius
<rpius@google.com>
Wed, 12 Jul 2017 18:33:20 +0000
(18:33 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 12 Jul 2017 18:33:20 +0000
(18:33 +0000)
1
2
core/res/res/values/config.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/WifiManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/config.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
wifi/java/android/net/wifi/WifiManager.java
Simple merge