tree 9a3defa7a18946ddfce5718cecc2ed6b8b1096bc
parent 489e9939783005295d1dc5239820e5f3983854e3
author Pavan Holla <pholla@chromium.org> 1658239040 +0000
committer Pavan Holla <pholla@google.com> 1658512649 +0000

Merge cros/upstream to cros/master

Contains the following commits:

" 6e6352e qdu: the file size upgraded by QDU is not necessarily a multiple of 4 (ljw)"

BUG=b:233339369
TEST=None

Change-Id: I47a18ff9b4483b952504fe0957b7a781a7b87622
(cherry picked from commit 297b790bb90349733ebbb26cde947e8602f9edc8)