commit | 929887c39297578519e266f9e658e32b4cdd2164 | [log] [tgz] |
---|---|---|
author | Felix Oghina <hackz@google.com> | Mon Oct 23 14:02:29 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 23 14:02:29 2023 +0000 |
tree | a943a7a09ad9b9e68dda9efc6590b63333863be0 | |
parent | 6d8f7bd7141a47630093e40b5d198cd313096c96 [diff] | |
parent | 43a6ab5b740da4f0d8606e1e8f8f3272225ea1c5 [diff] |
[automerger skipped] Merge "[contentsuggestions] update owners file" into main am: c39a8f8012 am: 6f6717161c -s ours am: 43a6ab5b74 -s ours am skip reason: Merged-In Ic0ffab3d0e673a65da0963b3726ea9e960c36da8 with SHA-1 cb6edb60d1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2794854 Change-Id: I92a40deb06098bb9247bb87f12b7fa050ce45d08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>