OSDN Git Service

am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor...
authorAndreas Huber <andih@google.com>
Wed, 7 Dec 2011 00:04:36 +0000 (16:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 00:04:36 +0000 (16:04 -0800)
* commit 'c4738293527618f9a228c3f0f645c0a0704ada9c':
  DO NOT MERGE: Remove the AVI extractor.


Trivial merge