diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-22 15:55:00 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 15:55:00 -0700 |
commit | d5e95c923ee83fbb08a4b0b38f20df1513883c12 (patch) | |
tree | 83c9c437605b2581db08685fd13a20ba65e90cd2 | |
parent | 4f658efea9ec25572ec4a5cd65b5e62f93db9bd8 (diff) | |
parent | fe757971b56e30878aeea876bf5d5704b081d4ea (diff) | |
download | external_qemu-d5e95c923ee83fbb08a4b0b38f20df1513883c12.zip external_qemu-d5e95c923ee83fbb08a4b0b38f20df1513883c12.tar.gz external_qemu-d5e95c923ee83fbb08a4b0b38f20df1513883c12.tar.bz2 |
am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.
* commit 'fe757971b56e30878aeea876bf5d5704b081d4ea':
Merge a83cf90 from master. Do not merge.
0 files changed, 0 insertions, 0 deletions