aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-09-27 12:54:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-27 12:54:25 -0700
commit25ab448260da9e7e1e0a39b4f4be2ba37980c557 (patch)
treed3de39363b2f9dc33025904efdd45e579c90548f
parent491e6d76fbf966811e0386d6d52622dfaae396c2 (diff)
parent40c8d18f4fdbceb63d64520ac7650b4f6ecd52bb (diff)
downloadexternal_qemu-25ab448260da9e7e1e0a39b4f4be2ba37980c557.zip
external_qemu-25ab448260da9e7e1e0a39b4f4be2ba37980c557.tar.gz
external_qemu-25ab448260da9e7e1e0a39b4f4be2ba37980c557.tar.bz2
am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.
* commit '40c8d18f4fdbceb63d64520ac7650b4f6ecd52bb': Merge from c3b969ab on master. Do not merge.
0 files changed, 0 insertions, 0 deletions