tree 76d9e0cabe45c1ed6d9ea87a5deb9c75c4345653
parent f8cb4bf36efbe497216e23043732fbb8949c7d43
parent 5f62213e684dbea03b5a2bb732405a03ccc1a815
author Alistair Delva <adelva@google.com> 1580946172 -0800
committer Alistair Delva <adelva@google.com> 1581014158 +0000

Merge '5f62213e684dbea03b5a2bb732405a03ccc1a815' into master

Update to fix an incompatibility with U-Boot 2020.01 on rockpi

IGNORE_MERGE_CONFLICT_CHECK==false positive

Bug: 147107640
Change-Id: Ie767196449b0a8e661883f8220ae02eb3535c4a5