Issue 1346013006: Fixing bad merge (CHECK is now RTC_CHECK)

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 1346013006: Fixing bad merge (CHECK is now RTC_CHECK) (Closed)

Created:
5 years, 3 months ago by phoglund

Modified:
5 years, 3 months ago

Reviewers:
AlexG

CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com

Base URL:
https://chromium.googlesource.com/external/webrtc@master

Target Ref:
refs/pending/heads/master

Project:
webrtc

Visibility:
Public.

Fixing bad merge (CHECK is now RTC_CHECK) BUG=None TBR=glaznev@webrtc.org Committed: https://crrev.com/e1c5ec72c6a55b12a00ed3de1504c663367c058d Cr-Commit-Position: refs/heads/master@{#9975}

Created: 5 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+2 lines, -2 lines)			Patch
	M	talk/app/webrtc/java/jni/peerconnection_jni.cc	View		1 chunk	+2 lines, -2 lines	0 comments	Download

Total messages: 3 (1 generated)

phoglund

Committed patchset #1 (id:1) manually as e1c5ec72c6a55b12a00ed3de1504c663367c058d (presubmit successful).

5 years, 3 months ago (2015-09-17 15:20:47 UTC) #2

commit-bot: I haz the power

5 years, 3 months ago (2015-09-17 15:20:51 UTC) #3

Message was sent while issue was closed.

Patchset 1 (id:??) landed as
https://crrev.com/e1c5ec72c6a55b12a00ed3de1504c663367c058d
Cr-Commit-Position: refs/heads/master@{#9975}