summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:36:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:36:30 +0000
commit8b5477f9d476651522bc59ff8542175ad8553392 (patch)
tree0338f58b70c6940b14a1571da3570c77933ba54c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3cf16a7fe981f1f3afac88a0f5906523f7b0fba4 (diff)
parentae88624e6c10bbe50f04938979d4b0e4b16589b8 (diff)
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into pi-dev am: f56666c524 -s ours am: 0295276dfa -s ours am: f400177a95 -s ours am: ae88624e6c -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 5f647cd3f2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602837 Change-Id: I2ff3f89f33700f106290ab3a7eb2e570f94baa7a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions