tree fb7152a8e5f16b4b933044a8ae14f79472928e01
parent 928866774981c8708267e3fa4f5f0c34b1bada39
parent 943e903eadd286c5ee309f33e8bebbf7e516d8fe
author Evan Charlton <evanc@google.com> 1399502052 -0700
committer Evan Charlton <evanc@google.com> 1399505610 -0700

resolved conflicts for merge of d4a1d2e5 to master-nova

Change-Id: I0b78644dfee1ee9d6cc8627bd480858361cfae43