diff options
author | Xavier Ducrohet <xav@android.com> | 2011-03-18 14:21:49 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-03-18 14:21:49 -0700 |
commit | 13705e8b2182da3e2d13bea5d074db77f4a92ab1 (patch) | |
tree | ba7c43f6a83d76f1d0c28f016526a14d070b8398 /android/main.c | |
parent | 631bcb7a533ce1f3da07299a9b8dc46598cd2ae3 (diff) | |
parent | 31203e4ba2e7b91aabe077aa9cac9158dd480775 (diff) | |
download | external_qemu-13705e8b2182da3e2d13bea5d074db77f4a92ab1.zip external_qemu-13705e8b2182da3e2d13bea5d074db77f4a92ab1.tar.gz external_qemu-13705e8b2182da3e2d13bea5d074db77f4a92ab1.tar.bz2 |
Merge "Revert "Revert "Merge 29e114d2 from master."""
Diffstat (limited to 'android/main.c')
0 files changed, 0 insertions, 0 deletions