commit | d0ab05ec8774c8d9b76b709346e4698e6e25db0e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:20:48 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:20:48 2023 +0000 |
tree | 72c38d84cbf1c049d95e9a4ce57c00606a56da1d | |
parent | 82bf4efbd173d0a1c9ab1d93889b7c8006e9095d [diff] | |
parent | 8baf8b51ad465be5e7a55dd78219c22cf4f3ebd9 [diff] |
[automerger skipped] Merge Android 14 am: aa43ca3bbf -s ours am: 817bd2f8b3 -s ours am: f842bf268f -s ours am: 1afbb6e3fe -s ours am: 8baf8b51ad -s ours am skip reason: Merged-In Idfb8953bf8205b78627c9081a9ef6b52d462234b with SHA-1 e1b6a73e39 is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/2776741 Change-Id: I86c76aa937b6ba3c5a0a34f4cd7c0b382bb4cbb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>