tree e0571b667777f75b8765a360aa189feaf5c3699c
parent 7a2b4a3fe876ac8dafc3a163c7e11cfe7645ea16
parent 3847e55e9b07d98debece909f0774b54ce264775
author Arnaud Berry <arnaudberry@google.com> 1565938464 -0700
committer android-build-merger <android-build-merger@google.com> 1565938464 -0700

Merge "Refactor image handling" into pi-car-dev
am: 3847e55e9b

Change-Id: Ie249e8041da072e77b9f2d772e087571ffba4705