tree ab02bccc19e83d54249f718b90f01386efc544ab
parent 7ef26acda9c18bb209644fc961541715393173e2
parent dad311a86ba8ecb5d5cd67b6b8252b55fa21e062
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1560332879 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1560332879 +0000

Merge "Merge "Fix NPE in NSSL test" into qt-dev am: c5e858a2c2 am: d4fd22c948" into qt-r1-dev-plus-aosp