tree bc33e9671a8e1887d5f4ccf21350b8e5fb8df9fc
parent 88e9a64f0bf9b3efee3396f8e427a8eb39a58e60
parent 6955738c9eb2302f21003288edb2d217170f1530
author Jun Yin <junyin@google.com> 1569001033 -0700
committer android-build-merger <android-build-merger@google.com> 1569001033 -0700

Merge "Remove force FW update at factory reset" into qt-r1-dev
am: 6955738c9e

Change-Id: Ib838fd03f1cbb3780baa1630691f92c77955610e