tree a97c0230a1ca1876a21a4b1a5da999b31cb4afd7
parent 9917209b15696c37251bc8b10d692eafbe803ba9
parent 5540281a6d3868ea425f774d0ac4d314ed7d5458
author Ned Burns <pixel@google.com> 1562208457 -0700
committer android-build-merger <android-build-merger@google.com> 1562208457 -0700

Merge "Change NVHM protection from crash to Log.wtf" into qt-dev
am: 5540281a6d

Change-Id: I7aee4a4db422fa2bdfc7deab110e92090f5c97e0