tree c0e409ef6f7e90d291f6fbda24e95921316db629
parent 2647d2e70e089eafbf7e4b1478e8de1aeddf5588
parent a8b959bb919366e99804f8f93bbb4511ee97d34c
author Bertrand Simonnet <bsimonnet@google.com> 1439229500 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439229500 +0000

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

* commit 'a8b959bb919366e99804f8f93bbb4511ee97d34c':
  metrics: Fix import paths for headers.