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:
e9e36ef
2ac5166
)
Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8
author
Ningyuan Wang
<nywang@google.com>
Wed, 2 Aug 2017 23:33:16 +0000
(23:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 23:33:16 +0000
(23:33 +0000)
am:
2ac51662c2
Change-Id: Iba59ba59df4bd1a5e773da6a76e54ee092ac551f
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/WifiInfo.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/WifiInfo.java
Simple merge