am 80a3083f: am 236b9872: Merge "Auto-clearing setError popup" into honeycomb

* commit '80a3083fdd106b2f839d50e1c861347faa969781':
  Auto-clearing setError popup