OSDN Git Service

Merge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08 -s ours am...
authorTri Vo <trong@google.com>
Tue, 27 Jun 2017 01:09:27 +0000 (01:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 01:09:27 +0000 (01:09 +0000)
am: 05ea368284  -s ours

Change-Id: Icb9113e3040016c44c4caafc73e14b0412328316


Trivial merge