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)
commitd1f46907e4feff055219139ea46dcc989353f982
tree7f98d95d033bb0849b59868ccd86fb6e500282bc
parent7b005496f6de4b67e23d3737553688125a08d069
parent05ea368284783055aca8de92970b193ab3e2f850
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: 5ce9898e08  -s ours am: 54c70a0e30  -s ours am: 997fd7b636  -s ours
am: 05ea368284  -s ours

Change-Id: Icb9113e3040016c44c4caafc73e14b0412328316