summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBenjamin Miller <benjaminmiller@google.com>2017-07-28 17:30:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-28 17:30:18 +0000
commit5934ae605a0d84f8a21c4637f60b07b884837dfd (patch)
tree4b21dd9e772d5d47832a819578725b8eecacc5c1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6683cc6a83a86c14a2b47ae7519a60a02ee3bc3c (diff)
parent91f16ace4f3121a34b038dd453386b9d4daf826a (diff)
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions