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:
ce61bb6
b69a01a
)
am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a1...
author
Wei Jia
<wjia@google.com>
Fri, 21 Aug 2015 20:30:35 +0000
(20:30 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Aug 2015 20:30:35 +0000
(20:30 +0000)
* commit '
b69a01a576b613fb1e6a2a58c189c8623c5adbac
':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Trivial merge