diff options
| author | Victor Chang <vichang@google.com> | 2016-07-13 18:36:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-13 18:36:37 +0000 |
| commit | e05b35db0d309b41edfe30e415b5fa746f7964a2 (patch) | |
| tree | 6b42d02aa8f9038c16a2b5f025a065e03d31d289 /tools/aapt2/diff/Diff.cpp | |
| parent | 7a9e9d5a3eefac4f1e38e7e03522076d51d76029 (diff) | |
| parent | 9c7b706cf4332b4aeea39c166abca04b56685280 (diff) | |
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions