tree 93705014698e68b09f4558f9406cd2c6e34a5ef0
parent c4ce69a593d3e565877163a8703f72aa6b451a38
parent f7b5cdd410cb8fdd46bac5b5098e0f01442bba12
author Andreas Huber <andih@google.com> 1323204406 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323204406 -0800

am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.