Merge "Minor updates." into honeycomb

This commit is contained in:
Elliott Hughes 2011-01-18 17:25:05 -08:00 committed by Android (Google) Code Review
commit 66818d220f

Diff Content Not Available