| commit | c7f0f2338a9e41d8bc3f5871881e6d5b44831460 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jun 13 16:15:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 16:15:19 2016 +0000 |
| tree | b63c22636521fde4f6b96a0d2d75e14c1da994c6 | |
| parent | 341b21d2f8921b5eb6adbce6652dc9f98182bf80 [diff] | |
| parent | cab4f9dc39aa3ff10bdab1cf7aefe3099c173cd4 [diff] |
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev am: cab4f9dc39 Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377