OSDN Git Service

am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge...
authorAndreas Huber <andih@google.com>
Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)
commit1add6848e09a89d0828a0117d0dd9bb2b2341000
tree6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e
parent75e7c07412f0dc55633dd0b81d4358ebe307eb0f
parentfcab2a8d5644875361f39f271fa9ffde59709c07
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1

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