Commit 013ebf9c authored by Amin Hassani's avatar Amin Hassani
Browse files

Merge branch 'cros/upstream' into 'cros/master' 

Fixed:
	connection_manager_interface.h: remove line 53-56
	fix the assert in common/http_fetcher_unittest.cc:637

BUG=none
TEST=sent squashed merge to buildbots and HWtest was success.

Change-Id: I15037921592a2b7a4dd76dff71417d03caf97cf6
parents a763c2dd e5f6f257
Expand all 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