diff options
| author | Victor Chang <vichang@google.com> | 2016-07-14 22:10:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 22:10:06 +0000 |
| commit | 07e11c3ae9c964ce1bdffc7103ff83993ed7c7aa (patch) | |
| tree | 7bd40d926d5a0acb7d03e0dd8d27a186daaaa350 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 60c459ff054a0d80efa3de48347fa61854001616 (diff) | |
| parent | 488042fe3b5b106f41d4a749212458fa2801cbd3 (diff) | |
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am: 488042fe3b
Change-Id: Ia41b8b2acbe3897423ac27881f3419efcfeeb002
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions