[polymer] Merge of master into polymer10-migration

tracing/tracing/value/value.html

Index: tracing/tracing/value/value.html
diff --git a/tracing/tracing/value/value.html b/tracing/tracing/value/value.html
index 9b9c79052fbf3aec9dcf890388124925560fc129..01f293c23e7abf3354db027c62c0b4882b79f8fe 100644
--- a/tracing/tracing/value/value.html
+++ b/tracing/tracing/value/value.html
@@ -126,6 +126,16 @@ tr.exportTo('tr.v', function() {
   NumericValue.prototype = {
     __proto__: Value.prototype,
 
+    merge: function(other) {
+      if (!(other instanceof NumericValue))
+        throw new Error('Merging non-NumericValues is not supported');
+
+      var numeric = this.numeric.merge(other.numeric);
+      var result = new NumericValue(this.name, numeric);
+      // TODO(eakuefner): merge diagnostics?
+      return result;
+    },
+
     asDictInto_: function(d) {
       d.type = 'numeric';
       d.numeric = this.numeric.asDict();