| commit | cab4f9dc39aa3ff10bdab1cf7aefe3099c173cd4 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jun 13 16:03:54 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 13 16:03:54 2016 +0000 |
| tree | bad9dc5745d97eca2ef01eed457ba5652cc8a99b | |
| parent | 98704bc4957eb55c4abbd528f85173a15fa59bb2 [diff] | |
| parent | 49be1c1b067d0cc3657dabbfbb080f02ac106026 [diff] |
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev