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

* commit '0d1289122c2215add91cb86d520a72fd0815b6b6':
  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