diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-28 10:46:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-28 10:46:45 -0700 |
| commit | 6e93697bf74fe127356e98bceabf67597c0e1084 (patch) | |
| tree | 2c8083ff16aed8d1761220716625d3c664b5e134 /hw | |
| parent | 33f89d05b375f18596fa5892acaaae356fbb0c0e (diff) | |
| parent | 7ae4139bbecc44a9d4210fde9de25f9acc1feff7 (diff) | |
| download | external_qemu-6e93697bf74fe127356e98bceabf67597c0e1084.zip external_qemu-6e93697bf74fe127356e98bceabf67597c0e1084.tar.gz external_qemu-6e93697bf74fe127356e98bceabf67597c0e1084.tar.bz2 | |
am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.
* commit '7ae4139bbecc44a9d4210fde9de25f9acc1feff7':
Merge from 33f89d0 on master. Do not merge.
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions