am 10ab8617: am 5e81a6e2: Fix trace mismatch.
am 10ab8617: am 5e81a6e2: Fix trace mismatch.

* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
  Fix trace mismatch.

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