OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 374d6e8 281b884)
resolved conflicts for merge of 281b884c to master
authorChristopher Ferris <cferris@google.com>
Wed, 11 Jun 2014 19:20:18 +0000 (12:20 -0700)
committerChristopher Ferris <cferris@google.com>
Wed, 11 Jun 2014 19:20:18 +0000 (12:20 -0700)
commit11cbb06b35cbcb488c7f39b71886ce379e57f867
treee63c065079040ea4f35081c7329c93253fc1e87etree | snapshot
parent374d6e86df490ee3b192bdb7a12c6ef42c091f59commit | diff
parent281b884c42fb6c2ba225009af3ecb4d84fbcc607commit | diff
resolved conflicts for merge of 281b884c to master

Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
media/libstagefright/rtsp/Android.mk diff1 | diff2 | blob | history
frameworks/av
About OSDN
Find Software
Develop Software
Help