tree b46dd55bc145531845da546a642637eb6eb1f59d
parent a763c2ddabdb9cb51057823e0d79e53d089427af
parent e5f6f2571d43eb65e0b27dd8d50f2c1f0b3fe30f
author Amin Hassani <ahassani@google.com> 1496944485 -0700
committer Amin Hassani <ahassani@google.com> 1497569078 -0700

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