
Nowadays the merge method has two arguments. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I3af44f8f1cdaae3fceff9ff4b1c467dc779b9880
Nowadays the merge method has two arguments. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I3af44f8f1cdaae3fceff9ff4b1c467dc779b9880