| commit | b64d3429491bcb9674b1198130374a08b19b3a1a | [log] [tgz] |
|---|---|---|
| author | Jeff DeCew <jeffdq@google.com> | Tue Aug 02 23:21:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 23:21:35 2022 +0000 |
| tree | 259186a53a01bcd192a9c5bcac4b2fa010e8b1b0 | |
| parent | d56cc1627fb88113b27296fce7d4d85597f191eb [diff] | |
| parent | 30df0c03c00859c4fd48c4d6c9152a38fad83d3e [diff] |
[automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am: 04928c8771 -s ours am: 7c5b922af8 -s ours am: d657a62950 -s ours am: 8582ebea5b -s ours am: b310ba4af2 -s ours am: 30df0c03c0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370 Change-Id: I40776d36fbbdc899a34066f3a3a7f6eba01aa98e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>