diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-23 13:31:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 13:31:44 -0700 |
| commit | 2553d03ea6af6df3719b21fa6aeb8d82fbe6cd39 (patch) | |
| tree | e04c9e5172e69803c6302cc8550212c0281824bb /hw | |
| parent | 404f157c59d0c3726ad35b21d4187ab28e23a871 (diff) | |
| parent | bcc9f5fc3b08c2eb932d75b21b546e60527c7499 (diff) | |
| download | external_qemu-2553d03ea6af6df3719b21fa6aeb8d82fbe6cd39.zip external_qemu-2553d03ea6af6df3719b21fa6aeb8d82fbe6cd39.tar.gz external_qemu-2553d03ea6af6df3719b21fa6aeb8d82fbe6cd39.tar.bz2 | |
am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.
* commit 'bcc9f5fc3b08c2eb932d75b21b546e60527c7499':
Merge from 5f8faae on master. Do not merge.
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions