OSDN Git Service

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
authorNingyuan Wang <nywang@google.com>
Wed, 2 Aug 2017 22:17:41 +0000 (22:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 22:17:41 +0000 (22:17 +0000)
commit2ac51662c2ed7c9642ddf43206d4c3ae964659de
treec7e2cfcc1d387fb2a47b2fa28e7c3b9cc57d4471
parent27191ac475257cd28e3401b19604ddbf49044b3e
parent54e6518fc8a70e39a32a9166305c524888869ea4
Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
am: 54e6518fc8

Change-Id: Ibe4c10de6efea5b4ba79f41cef8ca7a7ed2aa371
core/res/res/values/config.xml
core/res/res/values/symbols.xml