diff options
| author | Victor Chang <vichang@google.com> | 2016-07-14 22:09:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 22:09:59 +0000 |
| commit | c4ef7669a12950d8a9387d62e29f840447d80e72 (patch) | |
| tree | aa345ce9952810b191a0a1ab4d50454088af1f7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 87df5f6ded502f088cd530d90c08f238fbb375a0 (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: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions