am 48a65d99: Merge change I8c5f2fc3 into eclair
am 48a65d99: Merge change I8c5f2fc3 into eclair

Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-plus-aosp

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
  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