tree 4136df9997adcb0318b63f2582f10ed2c71541fa
parent e9de7c443570fe6e28892986766dc1d4948fd7f3
parent 471053ba87c4cc8c705271b3e7022bb99d0b79aa
author Tao Bao <tbao@google.com> 1531202173 -0700
committer android-build-merger <android-build-merger@google.com> 1531202173 -0700

Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c
am: 471053ba87

Change-Id: I5a0558926bdfae52bb867e3b6d3321fbc4e3b61b