From: Andreas Huber <andih@google.com>
Date: Wed, 7 Dec 2011 00:04:36 +0000 (-0800)
Subject: am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor... 
X-Git-Tag: android-x86-4.4-r1~1579^2~389
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=51a841af801adf360842b1de48f9564af2c1cb25;p=android-x86%2Fframeworks-av.git

am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

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

51a841af801adf360842b1de48f9564af2c1cb25