| commit | a005a0a6fa4f287db80bf9ebb9b7f25728f012b5 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jul 28 21:38:21 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 28 21:38:21 2017 +0000 |
| tree | 6befa30ed7036f4c2602a0fa0ae01566c6e3ba16 | |
| parent | cd0ca9a47612d81e64473d615abfc54ed64ddb5e [diff] | |
| parent | ed6627523565fb94191bcc6b9b06f2ee69b5bb03 [diff] |
Merge "Merge "Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: 5934ae605a" into oc-dr1-dev-plus-aosp am: 59d9947535" into oc-mr1-dev-plus-aosp