OSDN Git Service
(root)
/
android-x86
/
external-stagefright-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a17e3e9
4f5545a
)
Merge remote-tracking branch 'cm/cm-13.0' into jide_x86_lollipop
author
WuZhen
<wuzhen@jidemail.com>
Wed, 6 Jul 2016 12:16:00 +0000
(20:16 +0800)
committer
WuZhen
<wuzhen@jidemail.com>
Wed, 6 Jul 2016 12:16:04 +0000
(20:16 +0800)
NO_REF_TASK
tested: local run
Change-Id: If6523ccd94baeec109b4cbe477760aef479571f0
Trivial merge