Merge "Fix flash"

This commit is contained in:
John Reck 2012-03-02 15:37:53 -08:00 committed by Android (Google) Code Review
commit e058458135

Diff Content Not Available