| commit | a6ca52d0f746da9c1da40b693e6039bfdb7eb8de | [log] [tgz] |
|---|---|---|
| author | JW Wang <wangchun@google.com> | Thu Jun 25 02:49:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 02:49:24 2020 +0000 |
| tree | daa3a36bdc62988ca2c62c72212c8b5c2e68edab | |
| parent | 238c89cdf8f815986db80e2c54e6d5525c1e5784 [diff] | |
| parent | 491572c9cb10078b53229449bac83cb23bd93d05 [diff] |
[automerger skipped] Merge "Prevent a deadlock in #abandon" into rvc-dev am: 69c5cac4c1 am: 1bf197cab3 am: 8dd5f4e4d0 am: 491572c9cb -s ours am skip reason: Change-Id I512ea07a4f8750431b306fa6e3c47a600a50b64f with SHA-1 4ce1273f92 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11983819 Change-Id: I321f9d88341a2ff521fb85b8c9147c8afc7f9450