diff options
| author | Victor Chang <vichang@google.com> | 2016-07-13 18:40:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 18:40:49 +0000 |
| commit | 87ec0ef5e2aae7a078c132e70f017ac01e899690 (patch) | |
| tree | 6712ce73b32b339d70d2768945862d95b118bf5a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3ddb70c9e799977c9a9f0ee8f3cfbfdd22354812 (diff) | |
| parent | e05b35db0d309b41edfe30e415b5fa746f7964a2 (diff) | |
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-mr1-dev
am: e05b35db0d
Change-Id: I0b47bc6184ee3b4b9ac4783decf4c8cd30b70fbd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions