am 83086f5a: am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair
am 83086f5a: am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair

Merge commit '83086f5abbc84bd3ded576161c1709d0e3611ca4'

* commit '83086f5abbc84bd3ded576161c1709d0e3611ca4':
  Fix invalidate code path (#2273209).

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