summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2018-05-31 10:41:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-31 10:41:34 -0700
commitfc9df9896c738c932111731f37f07900b1b77c04 (patch)
tree54637d69ceb6828e8e6acbf25577f792a8c69a8f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc59f093cfb2c0fb6cb0107e9f1510745cf810091 (diff)
parent0a93a3530da35e22d1c85d59099b8c903b399e24 (diff)
Merge "Don't complain if a VPN changes capabilities." into pi-dev
am: 0a93a3530d Change-Id: I26d2e1526c21ad2bac369a565b06155780190692
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions