diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:35:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:35:09 +0000 |
| commit | 7b860136e46a30c5b54777d846ad26df6c59376b (patch) | |
| tree | 5a7d6af2c5e4beb1fb327a4aecf88990330bc806 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f0587af8a16f4b3b47e02ae9dbc89b9299d6bc10 (diff) | |
| parent | d3be1f437305a63aaa42ab1d814c266f5014ff01 (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: 82dccdbec8 -s ours am: 4b2c657cfa -s ours am: d3be1f4373 -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: I9bfcfc4ab7bfd4fc75e9841fec9741951f7485f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions