diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:58:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:58:27 +0000 |
| commit | 127f7f146deb5eca126fe8e6056920db803986ff (patch) | |
| tree | 5fa33a0abbbcaefed8417f1735d6928666c739d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0f7170d66850acd64b323f5c0e84f45967a02a8f (diff) | |
| parent | 3cf16a7fe981f1f3afac88a0f5906523f7b0fba4 (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: 3cf16a7fe9 -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: Id527e83dbf0ca883455b152c5b1260d7a27cd335
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions