Merge "Merge "Catch OutOfMemoryError and log warning" into qt-dev am: f66a0737ca am: 11f6608969" into qt-r1-dev-plus-aosp
am: 4bde80ce44
Change-Id: Ic315df5a6bcdfe7b8c5e5126ed29969c9720c7ec
This commit is contained in: