tree e0e7a8c3bd99fa51c2b8013d86807c9ef57df9d3
parent f7e2b55a70615a803d2d1b1e49f3ef0d9da3b9ae
parent c5e858a2c2581cb871c05e1ad52e8617003361e1
author Lucas Dupin <dupin@google.com> 1560332291 -0700
committer android-build-merger <android-build-merger@google.com> 1560332291 -0700

Merge "Fix NPE in NSSL test" into qt-dev
am: c5e858a2c2

Change-Id: I09312fc9149321df7e5630aed79f369b27bdf002