tree c4d202a99d59c0ccaffc59d1958056bae80a21b2
parent 052d536e07040cd90ab9946c12a176824c523299
parent b659749934bd491a1e9a2dc7d48f56797062fcbb
author Weng Su <wengsu@google.com> 1628344953 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628344953 +0000

[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -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/+/15212754

Change-Id: I0ffaf1c83a744ae30993c379a244b40f65a2ef04