tree 1c54ac9e557943caa4b7d5cd793bc57ada8471b8
parent 43e14c19a3d3d9452a6754cc4c031d619621474f
parent a0fae08d626db99657bf58f54f3e6d8ebd398e93
author Bo Hu <bohu@google.com> 1501630230 +0000
committer android-build-merger <android-build-merger@google.com> 1501630230 +0000

Merge "Revert "Revert "sdk: copy system-qemu.img to system-images.zip""" am: 89b9d42945 am: bb5235d40d
am: a0fae08d62

Change-Id: Ibfb8ce8dc840b6dbaf22bbae13060191b02e6b8f