tree b516d432b30af639aff63993459b2317b131536f
parent 9a3f299ec0fed5aba120309d835660a2551f859a
parent 87d2486777975b70a74d24385838c8e55ea86a18
author Bertrand Simonnet <bsimonnet@google.com> 1447369378 +0000
committer android-build-merger <android-build-merger@google.com> 1447369378 +0000

Merge "metricsd: Fix the update channel parsing logic."
am: 87d2486777

* commit '87d2486777975b70a74d24385838c8e55ea86a18':
  metricsd: Fix the update channel parsing logic.