am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS
am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS

* commit '84e195cdf794b590a070accded45e228fe1fbfd3':
  TIF: fix a regression introduced while addressing merge conflict in TIS

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