tree 00ff0cf71fbe0afcc687f1cf6d90171503b39453
parent c422d90a8351f55e42501ea7598b3e08cfbfd3d5
parent aaca9051a07be97beae16b72c455663a14c995ad
author Steven Moreland <smoreland@google.com> 1496245469 +0000
committer android-build-merger <android-build-merger@google.com> 1496245469 +0000

Merge "Check vendor_manifest_ for nullptr." am: 817d78e956 am: 2076da2a39
am: aaca9051a0

Change-Id: Ie4025dc94a308a670dc6a2448ae30e738a31e316