tree c90d3a848663402c9d77db36088aeb09fa236095
parent 37d58711f63052137e79b4fa319480299de535a6
parent 17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01
author Ying Wang <wangying@google.com> 1283385666 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283385666 -0700

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

Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'

* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
  Fix for crespo.