tree cbca85823f06389095ae8eb123bcadf53d495ad7
parent a0424dd2a55180d75453b267680cb3738379d4db
parent 5fb7caa15e832543c5efd66d1f06579d65f1c575
author Alex Vakulenko <avakulenko@chromium.org> 1403566622 -0700
committer Alex Vakulenko <avakulenko@chromium.org> 1403566640 -0700

Merge platform/diskk_updater into platform2

BUG=chromium:387976
TEST=None

Change-Id: Icf159ee05c8089cb18d1b215991fda0ef3476ece