| Index: tracing/tracing/value/diagnostics/reserved_infos.py
|
| diff --git a/tracing/tracing/value/diagnostics/reserved_infos.py b/tracing/tracing/value/diagnostics/reserved_infos.py
|
| index f6f9fc9439d0344b886a2dabc28502080b942577..e54edcbe6d7ea2cb58cdc6dcd30ee91db38bd5c5 100644
|
| --- a/tracing/tracing/value/diagnostics/reserved_infos.py
|
| +++ b/tracing/tracing/value/diagnostics/reserved_infos.py
|
| @@ -33,8 +33,8 @@ LABELS = _Info('labels', 'GenericSet')
|
| LOG_URLS = _Info('logUrls', 'GenericSet')
|
| MASTERS = _Info('masters', 'GenericSet')
|
| MEMORY_AMOUNTS = _Info('memoryAmounts', 'GenericSet')
|
| -MERGED_FROM = _Info('mergedFrom', 'RelatedHistogramSet')
|
| -MERGED_TO = _Info('mergedTo', 'RelatedHistogramSet')
|
| +MERGED_FROM = _Info('mergedFrom', 'RelatedHistogramMap')
|
| +MERGED_TO = _Info('mergedTo', 'RelatedHistogramMap')
|
| OS_NAMES = _Info('osNames', 'GenericSet')
|
| OS_VERSIONS = _Info('osVersions', 'GenericSet')
|
| OWNERS = _Info('owners', 'GenericSet')
|
|
|