| commit | 17c5ac1df56f1108d2f031ce57bd4e485ee6c254 | [log] [tgz] |
|---|---|---|
| author | Jeff DeCew <jeffdq@google.com> | Tue Aug 02 21:25:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 21:25:12 2022 +0000 |
| tree | 12c10396c97e2ab3f02cb1311e6788709d08d51f | |
| parent | 71227bd64802531792b4331687391a1f5da23116 [diff] | |
| parent | 7c5b922af83e73dde27741dd472ca6e195e01a46 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370 Change-Id: Ib899a052e6f771c9543cdc1c493590ee64dfef37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>