OSDN Git Service

Merge "Rename audio_utils/conversion.h to mono_blend.h"
authorTri Vo <trong@google.com>
Mon, 26 Jun 2017 21:58:36 +0000 (21:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Jun 2017 21:58:36 +0000 (21:58 +0000)
am: 5ce9898e08  -s ours

Change-Id: I79fd6d39c7eb6fb445285fbf48ddc0c524375bee


Trivial merge