| commit | 1add6848e09a89d0828a0117d0dd9bb2b2341000 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Dec 06 16:59:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:59:52 2011 -0800 |
| tree | 6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e | |
| parent | 75e7c07412f0dc55633dd0b81d4358ebe307eb0f [diff] | |
| parent | fcab2a8d5644875361f39f271fa9ffde59709c07 [diff] |
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 * commit '92860d5d4681e684d5f3936137c6c067c950121e': DO NOT MERGE: Remove the AVI extractor.