diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-27 12:56:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 12:56:31 -0700 |
| commit | ad3d7dbce9f66373930774fa0eb9877f54e859d1 (patch) | |
| tree | d3de39363b2f9dc33025904efdd45e579c90548f /vl-android.c | |
| parent | 25ab448260da9e7e1e0a39b4f4be2ba37980c557 (diff) | |
| parent | 4990431dfab2f2573ec4ddd97cf656a674ca9d07 (diff) | |
| download | external_qemu-ad3d7dbce9f66373930774fa0eb9877f54e859d1.zip external_qemu-ad3d7dbce9f66373930774fa0eb9877f54e859d1.tar.gz external_qemu-ad3d7dbce9f66373930774fa0eb9877f54e859d1.tar.bz2 | |
am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.
* commit '4990431dfab2f2573ec4ddd97cf656a674ca9d07':
Merge from 491e6d on master. Do not merge.
Diffstat (limited to 'vl-android.c')
0 files changed, 0 insertions, 0 deletions