tree 5841cb8f8c003dffa99e88c22138be8b400ec52d
parent 9f4cea6846aa4ac2ec57c97f5da17822eb9b9727
parent 7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef
author Romain Guy <romainguy@android.com> 1260402980 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260402980 -0800

am 7b935e84: Merge change Iead0d4d8 into eclair-mr2

Merge commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef' into eclair-mr2-plus-aosp

* commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef':
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.