Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Issue 2865193002: arc: Fix merge conflict (Closed)

Created:
3 years, 7 months ago by khmel
Modified:
3 years, 7 months ago
Reviewers:
hidehiko, kinaba
CC:
chromium-reviews, elijahtaylor+arcwatch_chromium.org, oshima+watch_chromium.org, yusukes+watch_chromium.org, hidehiko+watch_chromium.org, lhchavez+watch_chromium.org, victorhsieh+watch_chromium.org, davemoore+watch_chromium.org
Target Ref:
refs/branch-heads/3029
Project:
chromium
Visibility:
Public.

Description

arc: Fix merge conflict TEST=build passed BUG=716976 BUG=719689 TBR=hidehiko@chromium.org,kinaba@chromium.org NOTRY=true NOPRESUBMIT=true Review-Url: https://codereview.chromium.org/2865193002 Cr-Commit-Position: refs/branch-heads/3029@{#822} Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471} Committed: https://chromium.googlesource.com/chromium/src/+/c68ec2b733d3bdf2b46140d53a9800b27ae0fb86

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+0 lines, -3 lines) Patch
M chrome/browser/chromeos/arc/arc_util.cc View 1 chunk +0 lines, -3 lines 0 comments Download

Messages

Total messages: 5 (3 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2865193002/1
3 years, 7 months ago (2017-05-08 21:27:33 UTC) #2
commit-bot: I haz the power
3 years, 7 months ago (2017-05-08 21:29:48 UTC) #5
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/c68ec2b733d3bdf2b46140d53a98...

Powered by Google App Engine
This is Rietveld 408576698