tree 539ba3e77c0c2d6cf55ffa338d84e3e6754c9408
parent 7f039d16ca461165eb20a184f48b924c8b699e37
author Jay Shrauner <shrauner@google.com> 1420839887 -0800
committer Jay Shrauner <shrauner@google.com> 1420840334 -0800

Add null checks

Bug: 18959494
Change-Id: I6dca7a8696b3dc0d104cba974644e1c3a5179024