diff options
author | Chris Tate <ctate@android.com> | 2020-06-03 22:29:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:29:54 +0000 |
commit | 44654288c0bdb6a05ef4a9be123945900f57c761 (patch) | |
tree | b0f161feb20f1e495324aaa5d8dbd09816db14d4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f400177a95b9000c74198f6859504ba226fb05da (diff) | |
parent | f0a0963d1de7adb2688ba3ac18245419b3666003 (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 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: If66fefe1de9beeae831e87e50c78135620aa4a84
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions