tree 0b8558b26c420eae1689a859a2ba03c6a99396a0
parent 57cac4bad47c962748c02911eb404c1456c15212
parent 9daa540503148d76497af760fafc4b4d0a7786e3
author Fabian Kozynski <kozynski@google.com> 1627922263 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627922263 +0000

[automerger skipped] Merge "Fix index when moving SecurityFooter" into sc-dev am: d9f207c042 -s ours am: 9daa540503 -s ours

am skip reason: Merged-In Ibc85cd5501010fcf9752d8af103500479c6f28c2 with SHA-1 e52042c878 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433460

Change-Id: I3c7af0fabac0b2469474b5c3795fc47c3d39b3ad