| commit | 04928c8771aac01805043cc482058f55cb054faf | [log] [tgz] |
|---|---|---|
| author | Jeff DeCew <jeffdq@google.com> | Tue Aug 02 20:38:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 20:38:50 2022 +0000 |
| tree | 204d56ce9199c0537a099bb3f295e4a5be4b1bb8 | |
| parent | ac47d942ee8b9b3c6fd200740856d0356aedf298 [diff] | |
| parent | 2bd5ab6f268c53778d674920533ce74fe1623305 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370 Change-Id: I2192402fbd836aa9a4777721c8ecc3e5f9eb63da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>