tree db4da442da450336d1c00a0c98674330af5b26cd
parent 086e3a405625eba49b128d83743d2ae5a897a788
parent 621afac235e258c2c95526e3727e97e89c25d33c
author George Burgess IV <gbiv@google.com> 1547868050 -0800
committer android-build-merger <android-build-merger@google.com> 1547868050 -0800

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

Change-Id: Id7a8506c6ee2667f6a303905359a99e80dbced9d