OSDN Git Service

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

Change-Id: Ic885afb2eeda787f6a1f65da58db62f8485e285c


Trivial merge