am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp

Browse Source

Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'

* commit '09f672509b78344258f1b0d9f021d2ec99942515':
  Fix compilation errors in libmedia, libstagefright.

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-17 20:10:30 -07:00

committed by Android Git Automerger

parent 26095af235 09f672509b

commit 9f115228c8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available