tree 7269c6913b5e9e353393395d7031c092c38940db
parent f0352e03fd5f8d7d2173382674f1dc9753b9bca0
parent a965fc5e8f0c84cbeeaae7006eddbaf3bba64586
author Romain Guy <romainguy@google.com> 1352384320 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352384320 -0800

am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev

* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
  Dismiss error icon on setError(null) [regression] Bug #7442935