tree 6a85789f9573ce543ebd4b7833861a55b30c8fce
parent bb3e1c4ec2adbc0f8f8f53299895b0259d284e81
parent 1ed51e429a5f1d3430cd1cdf243f6db1e998c7b8
author Bertrand Simonnet <bsimonnet@google.com> 1439243654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439243654 +0000

am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."

* commit '1ed51e429a5f1d3430cd1cdf243f6db1e998c7b8':
  metrics: Consolidate constants in constants.h.