commit | fcab2a8d5644875361f39f271fa9ffde59709c07 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Tue Dec 06 16:22:07 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:22:07 2011 -0800 |
tree | ebca213f22bc3adee2b0c9efd3fb0aedef86918b | |
parent | 78074d5dc8122d750d97065a6d5ec419e26350d4 [diff] | |
parent | 72936144fd16d6d73b7383b634d53909f4887d2b [diff] |
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 * commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a': DO NOT MERGE: Remove the AVI extractor.