tree 43f41c85d39ad1977993acfa09bb37208df17158
parent 3f750c2bbe16cf758202ae707b37182633cc898e
parent 09fe4c0241abd4d3a19fc1e1423a136fcacbeda0
author Pengquan Meng <mpq@google.com> 1548789646 -0800
committer android-build-merger <android-build-merger@google.com> 1548789646 -0800

Merge "fix null pointer exception"
am: 09fe4c0241

Change-Id: I69e5ef278c87a243d6074f4718f0b0761e5c92a0