tree c00247bccea33e303dd4917a2143e01810906f8f
parent b462c1d9d5a523c9f2b5c0803a4a24539cf1b52a
parent 68952164ad21357b72e433c77530f669f1eb3acf
author Weng Su <wengsu@google.com> 1633677777 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633677777 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours

am skip reason: subject contains skip directive

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

Change-Id: If10c14a8684381b8bca2aec21ab65164e746054f