tree 1e359b46e1f8449645a31354bacc234bf8319a85
parent 840e2dcbae8d17bb6f092df32cb12324e18090b9
parent 9a6b9ed394c3ece622029ce5c169f19fd55de5b3
author Yunlian Jiang <yunlian@google.com> 1488331005 +0000
committer android-build-merger <android-build-merger@google.com> 1488331005 +0000

Merge "fix warning: dereference of a null pointer"
am: 9a6b9ed394

Change-Id: I8f944dd30a2663262baa00a08c1e4204a29242eb