| commit | ce4973ba674adfa7d3baaed49edcb8bac9cc8c40 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Jul 20 19:35:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 20 19:35:31 2021 +0000 |
| tree | fb26da044f54e19a5d48d4c90c78702580ee1d83 | |
| parent | 75ef1405bf6b95e869fa69a137fa82eedc88d795 [diff] | |
| parent | 90f27d4314335a6d0f45f3ee29cec34b45d28876 [diff] |
[automerger skipped] Merge "Attempt to fix mac build" into sc-v2-dev am: 6ef88d4fd2 am: 90f27d4314 -s ours am skip reason: Merged-In I1a7378ef90b7c71ba6da0ce439c41192bfe4bca6 with SHA-1 d426d2e4fc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15339511 Change-Id: I0b810aef8e64624200c6d1d08027b38c96c40f1c