tree 794bbeae1f7799e04f824f8699df84c399c37eda
parent f46d7518d3bc68f5fe009eaaeaef72c02a693fa0
parent 71e9c9c664a2e935ba14b591fb57787ad8b11b0c
author Yunlian Jiang <yunlian@google.com> 1476307686 +0000
committer android-build-merger <android-build-merger@google.com> 1476307686 +0000

Merge "Fix dereference null pointer warning." am: 4065e775e6 am: 8bb45af7e9
am: 71e9c9c664

Change-Id: Ic4e229d93f1ad4cefa1abc7d4e31991d89cceec8