tree 17c51154d61e8d1e7d999f8f52f2c4b1ff7c8b7f
parent 048490cc6808a935a987cf64dc04025b48d14f1f
parent 4065e775e643faa71102aa644acf8f93731e0b0c
author Yunlian Jiang <yunlian@google.com> 1476306902 +0000
committer android-build-merger <android-build-merger@google.com> 1476306902 +0000

Merge "Fix dereference null pointer warning."
am: 4065e775e6

Change-Id: I3fe4175c7b3957f3146e235efdb18ff2b1b54d08