diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-23 11:40:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 11:40:05 -0700 |
| commit | acf8ea03ec6b14567a5941c1eb4f5ae4c7b19b62 (patch) | |
| tree | 2308288c3fae94e758fb5c6a6d770cacebc93483 | |
| parent | c68dbbef0118eab4256acfc0d9430f0e557a82a1 (diff) | |
| parent | bed87f42f0001a3217ab005e728ef5b2e3a6fe14 (diff) | |
| download | external_qemu-acf8ea03ec6b14567a5941c1eb4f5ae4c7b19b62.zip external_qemu-acf8ea03ec6b14567a5941c1eb4f5ae4c7b19b62.tar.gz external_qemu-acf8ea03ec6b14567a5941c1eb4f5ae4c7b19b62.tar.bz2 | |
am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.
* commit 'bed87f42f0001a3217ab005e728ef5b2e3a6fe14':
Merge from c68dbbe in master. Do not merge.
0 files changed, 0 insertions, 0 deletions