Merge "Fix NPE"

This commit is contained in:
John Reck 2012-02-28 11:38:56 -08:00 committed by Android (Google) Code Review
commit ed66e1b988

Diff Content Not Available