tree 368d6ef41f88ea13fab09441370abde1b0ac7758
parent 022163282fd1342e1c3c7e7923d6673c970006e0
parent e84a0dc70f1713cf8f821adf8f8b6110718c5c42
author Bertrand SIMONNET <bsimonnet@chromium.org> 1403648279 -0700
committer Bertrand SIMONNET <bsimonnet@chromium.org> 1403648289 -0700

Merge branch 'merge-bootstat-rewrite' into merge-bootstat

BUG=chromium:387186

Change-Id: I1c1d6fbae601b0ef12e303703c166090a533a157