tree 4d7b1ed920721acab0ca93fe962e9f6ebf8be845
parent ffb887212aac46d4c05d56b64cf0caf30d6dfaa0
parent a1515b588ea0809f8b4b4f51f133be24a4f3827a
author hughchen <hughchen@google.com> 1526032475 -0700
committer android-build-merger <android-build-merger@google.com> 1526032475 -0700

Merge "Add new type into metrics_constants.proto" into pi-dev am: 603824a6e7
am: a1515b588e

Change-Id: Id6fafb25aaaffea432358dd770318b438254b761