diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-28 17:41:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-28 17:41:16 +0000 |
commit | 59d99475356f2908e1d2b7578db844e45921f1c1 (patch) | |
tree | dbde68444f75ce8ffcb92edc256525a05b12917a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2c2d19504c96642b14516dac84618477ab3283c5 (diff) | |
parent | 943c2ebb09098197c1e1d4ca2d00c655e17bb1cc (diff) |
Merge "Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: 5934ae605a" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions