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:
195f7c6
8b35cb5
)
Merge \\\"DO NOT MERGE omx: check buffer port before using\\\" into klp-dev am: 57139...
author
Wonsik Kim
<wonsik@google.com>
Tue, 21 Jun 2016 17:41:27 +0000
(17:41 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 21 Jun 2016 17:41:27 +0000
(17:41 +0000)
am:
8b35cb563d
-s ours
Change-Id: I40733cfbad5dac51eceb5e09ad3cad4688bea63e
Trivial merge