Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8 am: d03e2cd28d am: dfc3beda06 am: 16cf063cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16611809 Change-Id: I0697663e6d39c5ea0546c2d17df3577b2642174b
This commit is contained in: