tree bd54e4b327ae23d98d5520067f50d11c17c62462
parent b85bcf9fcd62b4cc89ea507022dde6c87a856c6a
parent 95d26139a41924f35add2d9584bfe3f9f00db756
author Roman Kiryanov <rkir@google.com> 1537281182 -0700
committer android-build-merger <android-build-merger@google.com> 1537281182 -0700

Merge "Do not crash if secontext is nullptr" am: 6418bb7d34
am: 95d26139a4

Change-Id: Ib169be64e25377e88ae32cedc1b0dad7403a5876