OSDN Git Service

Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
authorRobin Lee <rgl@google.com>
Mon, 13 Jun 2016 16:15:19 +0000 (16:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 16:15:19 +0000 (16:15 +0000)
commitc7f0f2338a9e41d8bc3f5871881e6d5b44831460
treeb63c22636521fde4f6b96a0d2d75e14c1da994c6
parent341b21d2f8921b5eb6adbce6652dc9f98182bf80
parentcab4f9dc39aa3ff10bdab1cf7aefe3099c173cd4
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am: cab4f9dc39

Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377