| commit | c33921672064745eb07a4cc91cd721ba730df102 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Mar 23 02:34:18 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 23 02:34:18 2022 +0000 |
| tree | 60c2f0c548551743407d31a0b4be18bebf792603 | |
| parent | d6118c099b71aac0100cce47f7e5f16cbbfb897e [diff] | |
| parent | 71e7dd63f781aac75a161d0c6e94a6abb953e256 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' am: 42b4c61d46 am: 71e7dd63f7 Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2029125 Change-Id: Ifd633d2823bdf3d97d216c7d29b7ccd13a9411ea