| commit | ecfeee7607781bcdd1139abf162a83c3d2d50c06 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 09:00:01 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 09:00:01 2021 +0000 |
| tree | f44672b3268bf2c3b001cea1ab4113accc236bb3 | |
| parent | c1e64b856694c60c6ddd42057705d31f04b44189 [diff] | |
| parent | 11409c7cdc2b1feb5b471f7889558b4dcc4f8622 [diff] |
[automerger skipped] Merge Android 12 am: 7bc98fae04 -s ours am: 251275938e -s ours am: 11be6eb68c -s ours am: bfeae14ba3 -s ours am: 11409c7cdc -s ours am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447 Change-Id: I9e607ee5657b1a21384f8e1298f6fe058bb787e0