diff options
| author | Jorge E. Moreira <jemoreira@google.com> | 2021-04-09 16:07:03 -0700 |
|---|---|---|
| committer | Jorge E. Moreira <jemoreira@google.com> | 2021-04-09 16:07:03 -0700 |
| commit | 072dce8ca50bdf87b113490cdf14bde14724914f (patch) | |
| tree | 7e0e07b9d8d50fc5dd352d5b36d74fa3cb3427db /cras/src/server/cras_audio_area.c | |
| parent | 0aaab56eba431583969e73f177a0efdcebf46cac (diff) | |
| parent | 3624a4296888926a21462bfd499d4ba91268046b (diff) | |
| download | adhd-072dce8ca50bdf87b113490cdf14bde14724914f.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into masterandroid-s-beta-2android-s-beta-1main-cg-testing-release
This merge is necessary to update crosvm to the latest version
Bug: 163867676
Test: locally
Change-Id: Ia0681ee12911ac60f44b04008c5a0590032733a3
Diffstat (limited to 'cras/src/server/cras_audio_area.c')
0 files changed, 0 insertions, 0 deletions