Commit 74384103 authored by Amin Hassani's avatar Amin Hassani
Browse files

update_engine: Merge remote-tracking branch 'cros/upstream' into 'cros/master' 

Do another merge to get a few important very recent CLs.

BUG=chromium:916593
TEST=unittests

Change-Id: Iee29b797270d8733838e755f9da0acaa405fd770
parents ef1af277 1c3db7d7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment