tree cb452ad384c21a969fceb1b821bcde97f019a757
parent 5858adbf3f2b74f790b48c43edcda384fb05f89e
parent 533a2803506cc4f196403fdfafd948bd4f8e60d9
author Mathias Agopian <mathias@google.com> 1259612272 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259612272 -0800

am 533a2803: Merge change I18ffb549 into eclair

Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-plus-aosp

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT