tree 8a4991d9350242060fb1bcadc1faf9058888cc6f
parent 6e55e76580018a831a60b0e98cd84ccf31d50466
author Daniele Di Proietto <ddiproietto@google.com> 1638538315 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1640704185 +0000

Fix sc-dev-plus-aosp builds

Ignore-AOSP-First: Fix merge conflict
Bug: 208964910
Change-Id: I7924d7b19ec30e42fd1d17ec913c4a75d51ea6bc
(cherry picked from commit 823f787a31bf7826add4104c31c76e39981a0369)
Merged-In:I7924d7b19ec30e42fd1d17ec913c4a75d51ea6bc