Craig Mautner 1f74bad9ac Check for null DO NOT MERGE
Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
2014-05-24 09:54:36 -07:00
..
2014-05-15 20:21:43 +09:00