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

* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base