tree c9917db0dc4c860c487f2b37527c8958d95bfdfa
parent 98abaff61896dd6716200aecb88c64a6c381b8f8
parent eaf65b54accdfc71caab62e8020f96cdddc850b5
author Treehugger Robot <treehugger-gerrit@google.com> 1599618665 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599618665 +0000

Merge "Merge branch 'upstream-master'" am: fe424c0786 am: ed1776b2c9 am: 5da6bb10ed am: 5d3751ab97 am: eaf65b54ac

Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1419088

Change-Id: Ia1f0abbbcdaa2ec7cc9684e2a197c9311aecb3e3