| commit | 54a41f9fb1f50b75eb318e7fac4ae945bf32191a | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Thu Jul 20 21:03:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 20 21:03:36 2023 +0000 |
| tree | dfeac12b9c9ecb6bf1d4d0fcc852f4e6ba5d7675 | |
| parent | 46d348151c3f53806b05fff93b408612a3729776 [diff] | |
| parent | 86e984c284ca11b82e0e1a5326d28b81ec70d61a [diff] |
[automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours am: 86e984c284 -s ours am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161ff1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764 Change-Id: Id7e7c72212adf2d2d95fae8f86384e3b389d75cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>