tree 50136329ead3f18165ec39b29ec974fe2d633f3a
parent ce71d90dd7a55de1398218caff0a033f038e457b
parent 2e920b373c2370ecb6932049deed137b7b7b7517
author Ben Chan <benchan@chromium.org> 1403842604 -0700
committer Ben Chan <benchan@chromium.org> 1403842619 -0700

Merge branch 'merge-cros-disks-rewrite' into merge-cros-disks

BUG=chromium:370271

Change-Id: Ib35f95c1c505c069d5f4b1d613f7a9a9f3f50805