tree abfb688cfdcd836c7c8d1907039b9fdae91b60a7
parent f85e6546e6596804f07a18452aa3d10cad5597c7
parent 76451438d97e93480e8bb4271379d41faa019d8c
author George Burgess IV <gbiv@google.com> 1547867288 -0800
committer android-build-merger <android-build-merger@google.com> 1547867288 -0800

Merge "Fix potential NULL dereference errors." am: bce5b2f971
am: 76451438d9

Change-Id: I517c8215dd8201d29d7f97ba7017164679559572