OSDN Git Service

Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f...
authorRobin Lee <rgl@google.com>
Thu, 19 Jan 2017 23:31:21 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 23:31:21 +0000 (23:31 +0000)
am: 185275e0ad

Change-Id: If1956964597ad1885dde00f23c55a4492f867977

1  2 
res/values/strings.xml

Simple merge