tree 28d15ee27c22afe5d633c8e2cb30f23c595e5c70
parent ce364eb942da52fdbd18b80ad34b4442a02e08b2
author Peter Nordström <pnordstrom@google.com> 1605909373 -0800
committer Peter Nordström <pnordstrom@google.com> 1605909373 -0800

Fix derating conflict issue

Applying patch fix-derating-conflict-issue-L4.14.98_GA2.0.0.patch
received from Frank at NXP on Nov 20, 2020.

Change-Id: I518ca7563f5d724c2f6b86cedeb35507742df358