| commit | 3aa5feb387e8407e18cf0bfc254d626ae213bfd3 | [log] [tgz] |
|---|---|---|
| author | Tri Vo <trong@google.com> | Mon Jun 26 22:04:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 26 22:04:14 2017 +0000 |
| tree | 5c4da77f7e1cae952324ca7fae2b9e6912c1b860 | |
| parent | 758b72d3f5e88c9e8686231b9bf844d0c7bdf352 [diff] | |
| parent | 0cd9a06871a638d374aef8cb3278b6d74fdef445 [diff] |
Merge "Rename audio_utils/conversion.h to mono_blend.h" am: d3463e15be -s ours am: 0cd9a06871 -s ours Change-Id: I14fa4b3fe4ca730f2480eac4112d3de449692a94