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)
commit05ea368284783055aca8de92970b193ab3e2f850
tree7f98d95d033bb0849b59868ccd86fb6e500282bc
parentf1939af2b5707f5db490917a4ed48e52850ae04d
parent997fd7b636846c3f22bfd7e61b56b9b0e7d88bb7
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08  -s ours am: 54c70a0e30  -s ours
am: 997fd7b636  -s ours

Change-Id: Ib204cff630bad507c5726d3b6554b46a755606a2