Merge "Fix build." into gingerbread

This commit is contained in:
Nick Pelly 2010-10-12 19:23:13 -07:00 committed by Android (Google) Code Review
commit 9bf9f7a444

Diff Content Not Available