OSDN Git Service

Merge "resolve merge conflicts of 8cff199b09d6 to master"
authorJason Monk <jmonk@google.com>
Wed, 18 Jan 2017 22:00:03 +0000 (22:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 22:00:06 +0000 (22:00 +0000)
commit056e44947e147ef6fdb951c53e11416276a24b3e
treebc222150a98c319780f73bb58c32895f6fbe21f8
parent20b0af809963c5b9c573cc681a57652103b0fd2e
parente7beaf3efa4148caad750434bb932bb5d15194e5
Merge "resolve merge conflicts of 8cff199b09d6 to master"
proto/src/metrics_constants.proto