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)
commit997fd7b636846c3f22bfd7e61b56b9b0e7d88bb7
tree1e99fa3d7b532c0f702bae1d76a97ebf0a2da496
parentfbdf010bdb4b31166df507b96bad2317649a659e
parent54c70a0e30cde6fb8eb261dc5cc0dcd09c8657b4
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08  -s ours
am: 54c70a0e30  -s ours

Change-Id: Ibdf5afac0bb8128dd19cfc374585695761609af2