tree c0b480be44f68e821482cf019793cd0a9af6b99f
parent 823f7f41dc1dc7a796f2b0a2666001a4933ef77a
author Amit Mahajan <amitmahajan@google.com> 1450291294 -0800
committer Amit Mahajan <amitmahajan@google.com> 1450294392 -0800

Added null checks to avoid NPEs.

Bug: 25793157
Change-Id: I1fec5855e59e8ef1986d6d0125953ca199c6476f