commit | 7062f8326d42cd9d8f39439433c67b5d40558d55 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:21:41 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:21:41 2021 +0000 |
tree | 7e738be44c4f2cd26302e42abbea1699bb8fe455 | |
parent | 8aa74d1ad45f135c7ae9f68083f67c6f65675945 [diff] | |
parent | 433825250dce3211cc1f83876628054507d27bea [diff] |
[automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1847386 Change-Id: I173e87e7a921aea51b68edc5056925bb21e7dbba