tree 7ad7565d811ace7ed36d9f37cdc629a9fb8a4842
parent 8098ca68c87113a65cda866829205ce451c2ae83
parent b6c01c1cb3465c14fddd623df7548b4f42c179e1
author Marco Nelissen <marcone@google.com> 1468372315 +0000
committer android-build-merger <android-build-merger@google.com> 1468372315 +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

Change-Id: I77395ab96bc309ac551d60d9543cc24f6a4befc5