| commit | 9f115228c8ff467a2bec5097515a8149105d8ef2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 20:10:30 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 17 20:10:30 2010 -0700 |
| tree | edc0da5f10c9d4a3cf9e5754cc48c5c7808ae90a | |
| parent | 26095af23561b93a4b269409bb291e7ab43c3a81 [diff] | |
| parent | 09f672509b78344258f1b0d9f021d2ec99942515 [diff] |
am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp Merge commit '09f672509b78344258f1b0d9f021d2ec99942515' * commit '09f672509b78344258f1b0d9f021d2ec99942515': Fix compilation errors in libmedia, libstagefright.