diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:57:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:57:04 +0000 |
| commit | 0f7170d66850acd64b323f5c0e84f45967a02a8f (patch) | |
| tree | 5fa33a0abbbcaefed8417f1735d6928666c739d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 28dbf4047fad6a74443ef1310a50b189705049bf (diff) | |
| parent | b61995b565ad6c9e0494da34788618078dd50a57 (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-qpr1-dev am: 480dc8cde6 -s ours am: 86dcec42d1 -s ours am: b61995b565 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 b2e84f0406 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11605558
Change-Id: If07832e80760439506d75b117cfe5701b0c67543
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions