diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:58:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:58:32 +0000 |
| commit | 430ea642ac803732a516af995204bc1caa6f50cf (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8ac8ec95f4e48f0b94672c95e60fa9891c785342 (diff) | |
| parent | 913d6bc93c997d5e6f7d289967aa3a8b55cc82b5 (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: 913d6bc93c -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/+/11604125
Change-Id: I0ffbe449f9ca0acbdac1e134232f8a6102ec4893
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions