OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a5e72ec
55d8132
)
DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa43850...
author
Wonsik Kim
<wonsik@google.com>
Thu, 16 Feb 2017 01:44:50 +0000
(
01:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Feb 2017 01:44:50 +0000
(
01:44
+0000)
am:
55d8132edd
-s ours
Change-Id: Ib1c0af161a2113c2c5f47d091c024ee34cb389e5
Trivial merge