OSDN Git Service

Merge changes from topic "vpn-dialog"
authorCharles He <qiurui@google.com>
Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)
commit7e75870d11bfc5281918b025be47022f0a851106
treea3d60c10400cf565f3dc4d182ce031a5a1e907e6
parent692b55390fd5d8e010c6d994bf2dd5dd9849137e
parent19bb1a0b99afcbb2ee4cb0f5b5d92011e0cc146f
Merge changes from topic "vpn-dialog"
am: 19bb1a0b99

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