| commit | 6e77c12b28573824b0e72f93841bfa8ded978b7e | [log] [tgz] |
|---|---|---|
| author | George Chan <georgechan@google.com> | Fri Feb 02 18:44:35 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 02 18:44:35 2024 +0000 |
| tree | f8e5e61e241d999a47ad3704f8abd79f12aefb4a | |
| parent | 3f1fef892b0772434ce1e0554561f707619537e7 [diff] | |
| parent | 49e4f4ca4092baba746b9f44aa3c213cd16c6c74 [diff] |
Resolved merge conflict on OWNERS file. am: 49e4f4ca40 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26111868 Change-Id: I1a2a5d723a142d5ba2faedd4eca413c2cfc34856 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>