tree 4446f67decf1c4296dbc2ab10062c41d1310c39f
parent f8e0c76e0326440e6371e8eaf88c446e565ee732
author Michael Jurka <mikejurka@google.com> 1307573414 -0700
committer Michael Jurka <mikejurka@google.com> 1307576435 -0700

DO NOT MERGE temp fix for NPE

Bug #3508479

Change-Id: I25c8aec546e2fe13c954fe362a4231e05039e607