Merge "Fix the build break in git_master-without-vendor" into honeycomb

This commit is contained in:
James Dong 2011-01-18 13:26:14 -08:00 committed by Android (Google) Code Review
commit 00a1bd859f

Diff Content Not Available