tree 338153d4d552ab10b683c817e6eb7e1ce9004adb
parent 2bbc2529a8c92e3c54da0542db21ad6d70e5fba1
parent 5f16b03f508e57d39157a437b6ef2b6ad7f6a412
author Mill Chen <millchen@google.com> 1596531784 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596531784 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iee5c21fab842219b73c82ae3f0a62673e1430de5