Merge "Fix NPE."

This commit is contained in:
Daniel Sandler 2011-09-14 18:56:12 -07:00 committed by Android (Google) Code Review
commit 9fb45a6eb1

Diff Content Not Available