| commit | 5a066fabb7e41cf0245abbae8e9af1dbb0e51f8b | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Dec 06 16:04:36 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:04:36 2011 -0800 |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | 0b23b237c83e4df2ef17dd5f0c11dcbdd3e8e950 [diff] | |
| parent | fbf277811bfc860b2fbb7ae6d89e441db2ed3ae1 [diff] |
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.