diff options
author | Chris Tate <ctate@android.com> | 2020-06-03 23:34:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:34:37 +0000 |
commit | f0587af8a16f4b3b47e02ae9dbc89b9299d6bc10 (patch) | |
tree | 5a7d6af2c5e4beb1fb327a4aecf88990330bc806 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 38ff5f1035171884456efcc23e284c5ca6b6e88d (diff) | |
parent | 0682ead4cf0631c69a712ebc617fd59dcde4a404 (diff) |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into pi-dev am: f56666c524 -s ours am: 0295276dfa -s ours am: f400177a95 -s ours am: ae88624e6c -s ours am: 4ab0c4d0d4 -s ours am: 2298abfc03 -s ours am: 0682ead4cf -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/+/11602837
Change-Id: I79eee8678cf242b8057d6df2fbf7a6753bfc10c5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions