tree 5fbf06461d94a8ffac6eb685c29b05e99b3b18b4
parent a2ef19bb97531e073b299378b47263b7850c5b60
parent d3abc029bc23b9ba1c1a0bb9eabfaf2e0682f317
author Mill Chen <millchen@google.com> 1596534565 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596534565 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -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: Icf99abb9f25670dbf0ac8c0d39cda13b4c364b6d