tree 3e6c3bc623fdc772e2dfcb2f681f18e53825e6ed
parent d67e22c12280b0674b28075c58734d6fef404394
parent 5dcdc8c8f45c076aa5d0bbf7b5c07cd829fe0b23
author Eugene Susla <eugenesusla@google.com> 1607362601 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607362601 +0000

[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138 -s ours am: 7bd20e27ab am: 90a1422f8c -s ours am: 5dcdc8c8f4

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

Change-Id: Ife51a5f9684c6f7fa5ce49a976c522bb0871913e