OSDN Git Service

Merge "Change VPN failure notification to dialog" into nyc-dev
authorRobin Lee <rgl@google.com>
Fri, 22 Apr 2016 16:08:56 +0000 (16:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 16:08:56 +0000 (16:08 +0000)
commitc9bc6075055e99f09c4b8d638ccf00ee279ed5a3
treefbea66e4925261415d204a5a5e63a036f50b97c4
parentedc7f834ac58950875313d9704c0e778a5a90095
parentdc1e59a3147dfef7c582f2881e25d504025baa6a
Merge "Change VPN failure notification to dialog" into nyc-dev
am: dc1e59a314

* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
  Change VPN failure notification to dialog

Change-Id: I9209c010bd1bf3d0d7b18bef32c05b302354494f
res/values/strings.xml