am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.

Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'

* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
  Fix for crespo.
This commit is contained in:
Ying Wang 2010-09-01 17:01:06 -07:00 committed by Android Git Automerger
commit 3e115b81a4

Diff Content Not Available