OSDN Git Service

resolve merge conflicts of 407c434 to nyc-mr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 12 May 2016 16:43:24 +0000 (12:43 -0400)
committerJulia Reynolds <juliacr@google.com>
Thu, 12 May 2016 16:45:29 +0000 (12:45 -0400)
commit94ad652c7a23d8464e2ac30a9c9de33e16431308
tree42c1b651db537b54c37e5088cbcab899b459b572
parenta68dc2ed5588a16ec7432e46e899ce54103805bb
parent407c4343b2dde2a2f9ac918a5fd2232f621d8ac4
resolve merge conflicts of 407c434 to nyc-mr1-dev

Change-Id: I7d4590dc22902dade7a8f81bb1a8321b526a4925
proto/src/metrics_constants.proto