From: Andreas Huber <andih@google.com>
Date: Wed, 7 Dec 2011 00:59:52 +0000 (-0800)
Subject: am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge... 
X-Git-Tag: android-x86-4.4-r1~1579^2~387
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1add6848e09a89d0828a0117d0dd9bb2b2341000;p=android-x86%2Fframeworks-av.git

am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1

* commit '92860d5d4681e684d5f3936137c6c067c950121e':
  DO NOT MERGE: Remove the AVI extractor.
---

1add6848e09a89d0828a0117d0dd9bb2b2341000