diff options
author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-28 17:30:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-28 17:30:16 +0000 |
commit | c058675b80a65aa7f4d2d9c1aef8ba495a5f0b6b (patch) | |
tree | f0d2d715665f2861029645f2424ee69d80a68aee /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fc862c9f86d6a5fd946d3f58818f9a9ee194304f (diff) | |
parent | 91f16ace4f3121a34b038dd453386b9d4daf826a (diff) |
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f
Change-Id: I9dd5d6641307589250d781dce11c4f2186b3c8fb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions