tree 4967905cea142ea165177bdae454776c74b68298
parent a35a7807c27641187e6de5dee8dcd405b683e294
author Michael Jurka <mikejurka@google.com> 1340040801 -0700
committer Michael Jurka <mikejurka@google.com> 1340041203 -0700

Add null pointer checks to fix NPEs

Bug: 6611233
Bug: 6685401

Change-Id: I804dfe0a7ad36b43168f7384ef88459d765fff6b