diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:17:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:17:38 +0000 |
| commit | 5e8ba50225e214cd1210dc66f35778ec993f3a96 (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9e247bafa990cbc8dc10aed72a7d445b4d07590c (diff) | |
| parent | 8ac8ec95f4e48f0b94672c95e60fa9891c785342 (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours am: 03f7e9d6fc -s ours am: f0a0963d1d -s ours am: 44654288c0 -s ours am: 60312c6aa1 -s ours am: 53afbcef63 -s ours am: 8ac8ec95f4 -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/+/11602836
Change-Id: I9bc201b7efe842eb824db7c2d32ce66fc6bd2fd7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions