Bug 997029 - Don't build Gaia when ./flash.sh gaia
Bug 997029 - (follow-up) Default to /system/b2g
Merge pull request #340 from timdream/push-only-for-flash-gaia

Bug 997029 - Don't build Gaia when ./flash.sh gaia, r=mwu
Bug 1009753 - Check for TARGET_DEVICE r=gsvelto
Merge pull request #349 from lissyx/bug1009753

Bug 1009753 - Check for TARGET_DEVICE or TARGET_BOARD_PLATFORM r=gsvelto
Bug 982093 - Remove persist single variant conf when flashing gecko and gaia
Merge pull request #335 from acperez/bug-982093

Bug 982093 - Remove persist single variant conf when flashing gecko and gaia
Bug 1010652 - Support vixen in B2G. r=mwu
Merge pull request #348 from xwaynec/master

Bug 1010652 - [Vixen][Tablet] Integrate vixen manifest file. r=mwu
Bug 1017312 - Flash cache.img if it exists.

Also allow flashing cache.img by itself (if someone wanted to do that
for some reason), and update a slightly confusing comment near this
code.
Merge branch 'master' of git://github.com/mozilla-b2g/B2G
Merge pull request #352 from jld/bug1017312-flash-cache-img

Bug 1017312 - Flash cache.img if it exists. r=mwu
Merge branch 'master' of git://github.com/mozilla-b2g/B2G