tree 2f94229373678c3c624180bdd1167d18c9acc605
parent f8c30bf281ead528fbbb643d1445abce67449ec8
parent 8bb45af7e914b655311c7ce7e71701c028885e77
author Yunlian Jiang <yunlian@google.com> 1476307306 +0000
committer android-build-merger <android-build-merger@google.com> 1476307306 +0000

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

Change-Id: I7291799331753f7388d9c6e6d8a155a1fce01365