summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPatrick Baumann <patb@google.com>2019-11-19 16:05:31 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-19 16:05:31 -0800
commit92269e5ef854ac83a4681768577529f69b7c52de (patch)
treef053c50f5d506daa1f20bcebbe87695ac0a37ca7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent080ddd5dfd8e20f769b59dea080136fb0efb735c (diff)
parent35dd014a79d1da52538fefb2a5f9682b915f4cb1 (diff)
Merge "DO NOT MERGE Avoids deadlock when applying preferred activities"
am: 35dd014a79 Change-Id: I9b4646c9c0674380e37eea44a226b1b279b53f6b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions