tree 7aea7b559099a4f01a121e2d53a438fdaccf4168
parent 99c0951b4a36ffd0135e7b9daa727d88b1ece084
parent 468ecb9591c35466d0a89b96d205da636a6f66a1
author Wei Huang <weih@google.com> 1253569791 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253569791 -0700

am 468ecb95: fix failing test.

Merge commit '468ecb9591c35466d0a89b96d205da636a6f66a1' into eclair-plus-aosp

* commit '468ecb9591c35466d0a89b96d205da636a6f66a1':
  fix failing test.