tree 7cf42df6c5c17b207be376eb00fe91d42bd9e352
parent 8e18afe1a90b2e39c828ce7a97fd05a0865e9fda
parent 18bdd79a2e242a58a7000feecd0fb17cc210fc59
author David Li <dvdli@google.com> 1622777045 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622777045 +0000

Merge remote-tracking branch 'remotes/aosp/upstream-master' into master am: 4c7b4979b6 am: 9c8625c20c am: c0b229f263 am: 18bdd79a2e

Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa_new/+/1726515

Change-Id: I49acf02fe417101e419a8011695e3f872dab6a5f