commit | 716e5bd6b0799c50fe7f6b84f3990d84f7d2863c | [log] [tgz] |
---|---|---|
author | Tri Vo <trong@google.com> | Mon Jun 26 22:12:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 26 22:12:47 2017 +0000 |
tree | dcfe54a546678fc25e4a0b2ef68579d3d0f1e997 | |
parent | ef80748c9858765c1c509302143acae0faa50413 [diff] | |
parent | 3aa5feb387e8407e18cf0bfc254d626ae213bfd3 [diff] |
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: d3463e15be -s ours am: 0cd9a06871 -s ours am: 3aa5feb387 -s ours Change-Id: Ieb6f867621d5e594c27dce98c13ff87e6d324e4e