tree 259186a53a01bcd192a9c5bcac4b2fa010e8b1b0
parent 0bc5eed6fab1882bb2fb1e1ab6c0e703d1a598cf
parent f160b0e03d2f2411b19d74ae57f1c28e7d4badb2
author Jeff DeCew <jeffdq@google.com> 1659482468 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659482468 +0000

[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: 17c5ac1df5 -s ours am: 97b6dba3be -s ours am: f160b0e03d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: I20b6275bfebf10ab7acf016ddf1508d4b1f29e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>