tree 2b475e2014eda4ad63c1a62ef11f61d3d3061f9f
parent 0660531df1722567f71b20ed4640beab469e45c0
parent 5f608087a77d1ff77c3ed15b38b4fa788322d3c7
author Ned Burns <pixel@google.com> 1561078584 -0700
committer android-build-merger <android-build-merger@google.com> 1561078584 -0700

Merge "Add main thread and reentrant asserts to chase down crashes" into qt-dev am: 4d39c4a7d7 am: b9e4f61927
am: 5f608087a7

Change-Id: Ic222d2021027e4a7f4350c4a8253c0b2d1041f4c