am 7dd042e3: Merge change 6543 into donut
am 7dd042e3: Merge change 6543 into donut

Merge commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9'

* commit '7dd042e32ee1e59227aafc4fbbc886c8ea0d0df9':
  Adding a missing catch

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