tree 8df668bc317ffcb9e1af335e4d0f2783382ea5f7
parent 90e455e519309e4e02991d714ff07062bd1b0ab3
parent 24f87e15e2a626040d208c0258c99be4e767b176
author TreeHugger Robot <treehugger-gerrit@google.com> 1628429988 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628429988 +0000

[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours

am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651

Change-Id: I05e285d6d57f7c9c757b5e7628f1a76678214c7a