tree cbca85823f06389095ae8eb123bcadf53d495ad7
parent 1014e666f180aa486bd04275a46eba8ec469380d
parent 85214febbe524b7effa1118638a444d9ec19854c
author Mike Frysinger <vapier@chromium.org> 1403567795 -0400
committer Mike Frysinger <vapier@chromium.org> 1403567800 -0400

Merge branch 'merge-metrics-rewrite' into merge-metrics

BUG=chromium:370259

Change-Id: I281cb4da5a24b595a1521766dd8d56b253a9ba2d