aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-10-19 08:44:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-19 08:44:46 -0700
commit276ff33b661b6a4e72902f824bdb9b3a6f0acaa9 (patch)
treecb51af33fc226d18f49b8a9b2cf5db518dc63aca
parent10736248a16d77293150cbca7f8a482ec82f68da (diff)
parentbcc9f5fc3b08c2eb932d75b21b546e60527c7499 (diff)
downloadexternal_qemu-276ff33b661b6a4e72902f824bdb9b3a6f0acaa9.zip
external_qemu-276ff33b661b6a4e72902f824bdb9b3a6f0acaa9.tar.gz
external_qemu-276ff33b661b6a4e72902f824bdb9b3a6f0acaa9.tar.bz2
am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.
* commit 'bcc9f5fc3b08c2eb932d75b21b546e60527c7499': Merge from 5f8faae on master. Do not merge.
0 files changed, 0 insertions, 0 deletions