diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:36:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:36:47 +0000 |
| commit | 913d6bc93c997d5e6f7d289967aa3a8b55cc82b5 (patch) | |
| tree | a78c4c8f133dddd177499c2a9bddd5d685840f9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a4e79c7d165c25188d89f316d44ec72e3338401e (diff) | |
| parent | 07715f906a6b53162853b8113c220fb94a4b6047 (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: Iae3d429e3297de0cb96840c62993959fb456d3c2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions