diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-10-19 08:44:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 08:44:47 -0700 |
| commit | aa3a00c352ecbb442be4cc4ab0ed9bdecbd0381b (patch) | |
| tree | cb51af33fc226d18f49b8a9b2cf5db518dc63aca | |
| parent | c6ecc7b7b698c6af8a509448643854ea91ba9ea1 (diff) | |
| parent | 4990431dfab2f2573ec4ddd97cf656a674ca9d07 (diff) | |
| download | external_qemu-aa3a00c352ecbb442be4cc4ab0ed9bdecbd0381b.zip external_qemu-aa3a00c352ecbb442be4cc4ab0ed9bdecbd0381b.tar.gz external_qemu-aa3a00c352ecbb442be4cc4ab0ed9bdecbd0381b.tar.bz2 | |
am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.
* commit '4990431dfab2f2573ec4ddd97cf656a674ca9d07':
Merge from 491e6d on master. Do not merge.
0 files changed, 0 insertions, 0 deletions