tree 2f734112fc33c8cd2296a0ac5c15342a1d341c43
parent 08b041d6160a20a04d4f298e71469443386a5884
parent 2fcbc26ec4507e07c3ce56b56a71d6816a591e70
author Xin Li <delphij@google.com> 1633683582 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683582 +0000

[automerger skipped] Merge Android 12 am: cfa4834340 -s ours am: 137cfca41d -s ours am: 8150866c15 -s ours am: e7f6c68561 -s ours am: 2fcbc26ec4 -s ours

am skip reason: Merged-In I7925468342205f443949f502b8f87c7d73b83a00 with SHA-1 d38f225f47 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/1847358

Change-Id: Ie72340fb9dff89e68f8a3e09708afb0c67aeb865