diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:37:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:37:37 +0000 |
| commit | 82dccdbec8c77a673b39ebf98db895bf7db05a89 (patch) | |
| tree | a78c4c8f133dddd177499c2a9bddd5d685840f9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4ab0c4d0d4fb033a4d990864a13f1a7c84eb1056 (diff) | |
| parent | 60312c6aa16eda1a9e03d51ebfde440188251f07 (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 skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9f8923d54a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602836
Change-Id: I90baa66be521e95ea40805cce44801afd0560368
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions