tree c80658b74510c9a78e19f8e2634cad42c1692572
parent ddf8a30ca7a113a8935b989f28085e4ee75348fa
parent ba1daeb73491467399c5b57d2edfcb4ad7b8e2c1
author Ned Burns <pixel@google.com> 1562219374 -0700
committer android-build-merger <android-build-merger@google.com> 1562219374 -0700

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

Change-Id: I39a143db317b2cb51b13825c8a71c5afcd72bc7a