Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 65409e484e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237 Change-Id: Ie58aa717d9c2696ae6cf93ea528de21e268ad716 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: