tree 6f52c282efba8042bf0f324929c66d1e36d5a505
parent 40197db4f04b759bbee976f83a7b32e559f45292
author Alice Yang <alice@google.com> 1378276903 +0000
committer Alice Yang <alice@google.com> 1378276903 +0000

Revert "Revert "Prevent an NPE""

This reverts commit 40197db4f04b759bbee976f83a7b32e559f45292.

Change-Id: If0c53c84fbdf6a54552f189752ab5bd4d8e8d8cf