summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:36:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:36:13 +0000
commit3cf16a7fe981f1f3afac88a0f5906523f7b0fba4 (patch)
tree0338f58b70c6940b14a1571da3570c77933ba54c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb61995b565ad6c9e0494da34788618078dd50a57 (diff)
parent07715f906a6b53162853b8113c220fb94a4b6047 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-dev am: 89600e2289 -s ours am: c7f10afcae -s ours am: 07715f906a -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 b581128020 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11604125 Change-Id: Ie5881fe3883031469afef3b5194ea3d3da4ec682
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions