| commit | e3524d33c6f0296f38d53ec05397698a74fd755a | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Dec 06 16:59:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:59:52 2011 -0800 |
| tree | 127399ffe03b7d961b45dcb5ade2cb22df2d08f4 | |
| parent | afd93d515dadcabd9f4b02176813eb5818372621 [diff] | |
| parent | 92860d5d4681e684d5f3936137c6c067c950121e [diff] |
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 * commit '92860d5d4681e684d5f3936137c6c067c950121e': DO NOT MERGE: Remove the AVI extractor.