tree 4f00905e5f929528873a5ba6bd480eb15323c07f
parent 54fcb56b8bec067712c0cc87a01560142dde53c6
parent 776b9341e7c9ce7eec36df14b663f34a162c4f56
author Marco Nelissen <marcone@google.com> 1468372724 +0000
committer android-build-merger <android-build-merger@google.com> 1468372724 +0000

Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c am: e26d11fd1f am: 9f57b2d447 am: 115c5d36b2 am: 7881d834d2 am: 571f65a3e8 am: e0a921ca5c am: e684ba6f6f am: b6c01c1cb3
am: 776b9341e7

Change-Id: I4494659709d2c5c855a3b3ee081a17528499798d