tree 8227c5af307405eaabf801226ae857b240d6b173
parent 54eb5e201bd73902bb8e5141872cbf577aa86ca2
parent f0e3514d8e44ca657619a84a3f0135a65115c6f0
author TreeHugger Robot <treehugger-gerrit@google.com> 1660234713 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660234713 +0000

[automerger skipped] Merge changes from topic "new-intent-navUp-sc" into sc-mainline-prod am: f0e3514d8e -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c43f is already in history

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

Change-Id: I175931c0720aadc1e5f6e6778f77e3088b86a371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>