tree b62c1cc1ef9030e7d77c00877ab5583ec5115bf5
parent 6e9b1146e4c15fe730148b2cba2cd506b9cfde3b
parent 6e56ff26c713694206b00b31330b37e0ebf66b8a
author Xin Li <delphij@google.com> 1599784776 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784776 +0000

[automerger skipped] Merge Android R am: 6e56ff26c7 -s ours

am skip reason: Change-Id Ia2a3906818c66adc28c14047af395289306da9aa with SHA-1 6e9b1146e4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/SystemUpdater/+/1421767

Change-Id: I9d700d04580fe757dd9b968b39ad26ea47bd8589