am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."
am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."

* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.

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