tree db47ed3ea5b48c745b2dce21db2cb5c87c76e8af
parent 96ef9f68a43604c99cd18537a6c8e9d1c5049c31
parent 4700fed72b619a09a0d9cac93e86625b95c730dc
author Joe Onorato <joeo@android.com> 1267495043 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267495043 -0800

am 4700fed7: Maybe this will silence http://b/2460740

Merge commit '4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp

* commit '4700fed72b619a09a0d9cac93e86625b95c730dc':
  Maybe this will silence http://b/2460740