tree d144108b38592e02d3e75e36fc2eec8de2b8c2e6
parent 4036f5ab2ffbe5a2e47d46aa376e9791385cc31b
parent 932d61d9ae1f5ede45702c381694880cfb6d700b
author Bertrand Simonnet <bsimonnet@google.com> 1439229078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439229078 +0000

am 932d61d9: Merge "metrics: Fix import paths for headers."

* commit '932d61d9ae1f5ede45702c381694880cfb6d700b':
  metrics: Fix import paths for headers.