OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Thu, 6 Oct 2016 16:41:07 +0000 (18:41 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Thu, 6 Oct 2016 16:41:07 +0000 (18:41 +0200)
commit9ad4646c03514d606fcdfd4d7e2ca170cc306f71
tree29060a2bc73bf1f81884ae7f03953e3741d71c48
parent22ea73e8656d02df2efc199db6e07a7f3382197a
parentfdc0d6b58aaeef0952e0463ed64ad4ed01cc6264
Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Conflicts:
data/media_codecs_ffmpeg.xml
data/media_codecs_ffmpeg.xml