Merge "fix build"

This commit is contained in:
Guang Zhu 2012-02-13 18:38:54 -08:00 committed by Android (Google) Code Review
commit 04568b15b0

Diff Content Not Available