tree 1305a79855363b04b8f0dc42d29eb3f1ec1104b0
parent 3425134204ad9dab032821016df40d4efda92f1a
parent 34a0e1b00b9baeff19e94f1ee35dd890063489d2
author Joe Onorato <joeo@android.com> 1260918331 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260918331 -0800

am 34a0e1b0: fix bug 2326478

Merge commit '34a0e1b00b9baeff19e94f1ee35dd890063489d2'

* commit '34a0e1b00b9baeff19e94f1ee35dd890063489d2':
  fix bug 2326478