Merge "Fix test-related build breakage."

This commit is contained in:
Jeff Sharkey 2011-06-13 00:15:15 -07:00 committed by Android (Google) Code Review
commit 3a62a45f8e

Diff Content Not Available