OSDN Git Service

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

Change-Id: Ib204cff630bad507c5726d3b6554b46a755606a2


Trivial merge