Issue 2361533002: Fix m54 build caused by bad merge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 2361533002: Fix m54 build caused by bad merge. (Closed)

Created:
4 years, 3 months ago by jdufault

Modified:
4 years, 3 months ago

Reviewers:

CC:
chromium-reviews

Target Ref:
refs/pending/branch-heads/2840

Project:
chromium

Visibility:
Public.

Fix m54 build caused by bad merge. BUG=649069 (cherry picked from commit 5f21d8f4e4a64fbd54c76b571652d9d014ad3017) Committed: https://chromium.googlesource.com/chromium/src/+/3513bccc1d4b909bba5a45a3da712b6db5218642

Created: 4 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -0 lines)			Patch
	M	ash/common/system/chromeos/palette/palette_tool_manager.cc	View		1 chunk	+1 line, -0 lines	0 comments	Download

Total messages: 2 (1 generated)

jdufault

4 years, 3 months ago (2016-09-21 19:31:03 UTC) #2

Message was sent while issue was closed.

Committed patchset #1 (id:1) manually as
3513bccc1d4b909bba5a45a3da712b6db5218642.