OSDN Git Service

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8
authorNingyuan Wang <nywang@google.com>
Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)
commit594f034cca9f594238bd7d06105f4feeaae1c467
tree17619fb78270fa9d51d6f3f3886e7b840341fa7a
parente9e36ef23f3a77bb1e5d7d0dc0c269e2c5f32a7b
parent2ac51662c2ed7c9642ddf43206d4c3ae964659de
Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8
am: 2ac51662c2

Change-Id: Iba59ba59df4bd1a5e773da6a76e54ee092ac551f
core/res/res/values/config.xml
core/res/res/values/symbols.xml
wifi/java/android/net/wifi/WifiInfo.java