am 6a6977e8: Merge "Fix 5266335: bad DIRTY/invalidation logic"
am 6a6977e8: Merge "Fix 5266335: bad DIRTY/invalidation logic"

* commit '6a6977e8728f3a3d209daadf587079dc7369050b':
  Fix 5266335: bad DIRTY/invalidation logic

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