Merge "Fix the build" into honeycomb

This commit is contained in:
Romain Guy 2011-01-10 17:30:57 -08:00 committed by Android (Google) Code Review
commit d6cd174ba0

Diff Content Not Available