Merge "Fix NPE"

This commit is contained in:
John Reck 2012-02-01 15:03:38 -08:00 committed by Android (Google) Code Review
commit 16a2e0027d

Diff Content Not Available