OSDN Git Service
(root)
/
android-x86
/
system-media.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbdf010
5ce9898
)
Merge "Rename audio_utils/conversion.h to mono_blend.h"
author
Tri Vo
<trong@google.com>
Mon, 26 Jun 2017 21:58:36 +0000
(21:58 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 26 Jun 2017 21:58:36 +0000
(21:58 +0000)
am:
5ce9898e08
-s ours
Change-Id: I79fd6d39c7eb6fb445285fbf48ddc0c524375bee
Trivial merge