aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
authorDavid Turner <digit@google.com>2010-02-08 09:17:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-08 09:17:15 -0800
commit76dbca0489ab98a46f2954bc7b77c3df6f9d8264 (patch)
tree8368692099f45878e4ecaf9df94ffc571d706a13 /Makefile.android
parent7454110c1a1e10dff6dc00c728a428d6294be587 (diff)
parent720b75ff159c33b0e939a0b1d67c7d103443b57c (diff)
downloadexternal_qemu-76dbca0489ab98a46f2954bc7b77c3df6f9d8264.zip
external_qemu-76dbca0489ab98a46f2954bc7b77c3df6f9d8264.tar.gz
external_qemu-76dbca0489ab98a46f2954bc7b77c3df6f9d8264.tar.bz2
am 720b75ff: (-s ours) am 6c77585b: Merge "Revert previous patch to fix SD Card emulation - DO NOT MERGE" into eclair
Merge commit '720b75ff159c33b0e939a0b1d67c7d103443b57c' * commit '720b75ff159c33b0e939a0b1d67c7d103443b57c': Revert previous patch to fix SD Card emulation - DO NOT MERGE
Diffstat (limited to 'Makefile.android')
0 files changed, 0 insertions, 0 deletions