commit | 4cc514c3c38f214237b80bf44c8903abc062a7f9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jan 07 18:57:05 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:57:05 2022 +0000 |
tree | 7ce8d41c849e3b25c186ae8b8ccc15d486824c87 | |
parent | 20ec35ec34b6e08ca85a99ad939df86b676ab6ea [diff] | |
parent | 9d0825f6bdb45c9a4f832beb46be1cf325451534 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours am: 6930ac9588 -s ours am: 9d0825f6bd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736 Change-Id: I5a88db3c390939bd123b43d4800a3b47d0ff2f53