| commit | 442498681d19a26def2bccc198fbaec6783e163a | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jun 13 16:15:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 16:15:20 2016 +0000 |
| tree | 9c22a5ac0f5f083d17de5ea8a28c69d722047dfa | |
| parent | 1ba2cbbfc251ff94d56ff68ef92b5e10e54c6687 [diff] | |
| parent | cab4f9dc39aa3ff10bdab1cf7aefe3099c173cd4 [diff] |
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev am: cab4f9dc39 Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49