tree e63c7d618987917950d4ed3ff41b1ae1974e53ea
parent 8308928a891092e2840f46e774d5ad47d07f4a12
parent 7c297fa38abc8e2533070c463065606d3b8d587e
author Xin Li <delphij@google.com> 1614076450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614076450 +0000

[automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours am: 7c297fa38a -s ours

am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d9b48478314d125c5d1db99ac28d97486e2f06d