tree 75a7e33f1daae846b566295d979091cce236e17d
parent 0ef6247c4f898e9259872d3565a604d7bebbf36d
parent b42dfa745b8159ab12b9720f409776cde466d6ec
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1546461962 -0800
committer android-build-merger <android-build-merger@google.com> 1546461962 -0800

Merge changes I7add6dff,I0249f758
am: b42dfa745b

Change-Id: I7c8544215b13db8440c4a72671996da0fac3be2e