summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2020-06-03 22:58:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 22:58:49 +0000
commit2298abfc03860e0655a3e73c147ac439e8521968 (patch)
tree5f756d574b463c36bf093894138de09b5c34d23f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent430ea642ac803732a516af995204bc1caa6f50cf (diff)
parent4ab0c4d0d4fb033a4d990864a13f1a7c84eb1056 (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: 4ab0c4d0d4 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602837 Change-Id: I70528e1c9b9d531f20eacbb9ac467c673da1ec37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions