am 7835b0b7: Merge change 3192 into donut
am 7835b0b7: Merge change 3192 into donut

Merge commit '7835b0b742a36641a4005663134dc0b5d0678eab'

* commit '7835b0b742a36641a4005663134dc0b5d0678eab':
  Fixes #1882836.

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