OSDN Git Service

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

Change-Id: Ibdf5afac0bb8128dd19cfc374585695761609af2


Trivial merge