summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2016-07-14 22:18:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 22:18:28 +0000
commit0e06694e35d183da0a9e5d19c2aca87c03b26aeb (patch)
tree1e898a52e76cc791888d1cd1a5aeba21a2c44dde /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7ee42eb90000e451fc2e281af9b058fa7048d7ce (diff)
parent07e11c3ae9c964ce1bdffc7103ff83993ed7c7aa (diff)
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am: 488042fe3b
am: 07e11c3ae9 Change-Id: If1ff799f4c515b84dbb8cb4fa6f06f747f78bf67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions