Merge "Fix for startup NPE."

This commit is contained in:
Conley Owens 2011-04-27 11:40:46 -07:00 committed by Android Code Review
commit 9deec6fe2a

Diff Content Not Available