tree b0153595384fd5d529ebed56f7b4ffe271f17e50
parent f75b97d7cf23b4b3401ca4ecbc0604ae64ebc037
author Mitch Rudominer <rudominer@google.com> 1502520405 -0700
committer Mitch Rudominer <rudominer@google.com> 1502560688 -0700

Adds the method EnvelopeMaker::MergeOutOf().

Moves the contents out of |*other| and merges it into |*this|,
leaving |other| empty.

This will be used in a later CL in our implementation of ShippingManager
in the case that a send fails.

Change-Id: Ifdfd8ff740aed429fcccfe6eafb23f7ed6018978