| commit | a9676a82efbec4a46db8e5e58f0f701c7f7d6e05 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Dec 07 11:03:00 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 11:03:00 2011 -0800 |
| tree | 97d9cc853967d554eb3be7b599f0d092175e00e5 | |
| parent | fa19c45913900baa6d3ef50fb4d2048684b63906 [diff] | |
| parent | 72936144fd16d6d73b7383b634d53909f4887d2b [diff] |
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 * commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a': DO NOT MERGE: Remove the AVI extractor.