tree 71a771d1a3ed4457f20a91ce547ad4730b1af793
parent b16c03f77f814afd705e3522ccf73c9f650ca599
parent 71ca047139953d49bbc36cb8e342b3a7b1eeeafc
author Yunlian Jiang <yunlian@google.com> 1487730656 +0000
committer android-build-merger <android-build-merger@google.com> 1487730656 +0000

Merge "fix warning: Dereference of null pointer" am: a2e67eb95e am: 7ac1f99edb
am: 71ca047139

Change-Id: Ic396b2bef7b21fa9fe0ed86d00dde30a58c55087