OSDN Git Service

resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Fri, 13 Jun 2014 10:19:14 +0000 (11:19 +0100)
committerNarayan Kamath <narayan@google.com>
Fri, 13 Jun 2014 10:19:14 +0000 (11:19 +0100)
commit8b8e5d45928aed8592d321fe55f560e35a4fece8
tree4b3f3a52af3086587e3ac3cb741698b005c64fb1
parent2a8270e6944fb3addfcba87f6885aaad196b8b88
parentcbd74fcbd2528e3cdb699ac26e8ed579085dd49a
resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp

Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
media/libstagefright/ACodec.cpp
media/libstagefright/OMXCodec.cpp