tree b34f3b59b4b92f93ce117f394cbd616b96eb6519
parent 5e965b81989d1d0fdf91d1936224b02d95f9c6f6
parent 765c0f8ed116bafc3211cd52db4035e67061bcac
author Lalit Maganti <lalitm@google.com> 1638457551 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638457551 +0000

Merge "GCC: fix ambiguous call to make_optional" am: 765c0f8ed1

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1907935

Change-Id: I51fd99611d59af226a444e6986ae76dc8ad1d70d