Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 9f115228c8fM
am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp Merge commit '09f672509b78344258f1b0d9f021d2ec99942515' * commit '09f672509b78344258f1b0d9f021d2ec99942515': Fix compilation errors in libmedia, libstagefright.
Showing diff to26095af2356