tree 7bd6432eccfe821c2338226ad63a8fdef4ecabc6
parent 2decd2d982c50228520b17b472fad9b8f694bed4
parent 61833e108ed46b4792eade015501128da9edc4cc
author Pengquan Meng <mpq@google.com> 1568594027 -0700
committer android-build-merger <android-build-merger@google.com> 1568594027 -0700

Merge "Add brandOverride back to IccRecord" into qt-qpr1-dev
am: 61833e108e

Change-Id: I04b8413bc1606c5a49555223a8a14af45468af92