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