summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-01-19 06:38:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-19 06:38:29 +0000
commitaba7c9affa3895959b24ee057002fb12d946e705 (patch)
tree756046b2a76d998c2b85c518cc7e8b2f4095aba4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent55209a628496a6dfd82d0403ebd93d98f51eae6b (diff)
parent8580fda42432e89dfed0b8b5db5ea2b8edc21e0b (diff)
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev am: bb08c408a8
am: 8580fda424 Change-Id: I6e6db06f61956ea1cee9d792bb4b3d812404a9d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions