diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:58:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:58:09 +0000 |
| commit | 8ac8ec95f4e48f0b94672c95e60fa9891c785342 (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f65ca6d11d50d9481858508a09b061b8ce25bedb (diff) | |
| parent | 53afbcef63e12ddbcdb9eba2a7fb87ef1e6bab8b (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 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: I0b182bb89c3c430cadb36eaa25a70518d3e3ab28
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions