tree 0be53dcb304dddde84c65a7396173d88f6cf986f
parent dedce44ca873ceb1e4269c7427177da7a3110b8c
parent 8bdeed59aa956c50f5a70cfa7ea8a66b16278fe2
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1546462197 -0800
committer android-build-merger <android-build-merger@google.com> 1546462197 -0800

Merge changes I7add6dff,I0249f758 am: b42dfa745b
am: 8bdeed59aa

Change-Id: I335f3e5f617add8bdbfc6e5c0bb6a0eab80f4f9a