Commit 0b318805 authored by Carlos Knippschild's avatar Carlos Knippschild Committed by Commit Bot

Merging changes from Feed repo up to 77405b1

Note that most of contents from the single merged commit had already
been addes as part of 402ea42d.

    Import commit 77405b1370937094ae69af4933f3e06109dd53ba
    Author:     Feed Team <no-reply@google.com>
    AuthorDate: Fri Nov 13 12:15:07 2020 -0800
    Commit:     Copybara-Service <copybara-worker@google.com>
    CommitDate: Fri Nov 13 12:15:34 2020 -0800

        Acknowledgement notice card bit in Feed V1 feed query.

        PiperOrigin-RevId: 342313135
        Change-Id: I8757791437ee872f024ee4f29f2e573a483f3d7d

Change-Id: I83d2cd64e611a3e9b2934e2417cf3bba7f3f3605
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552578
Auto-Submit: Carlos Knippschild <carlosk@chromium.org>
Commit-Queue: Ian Wells <iwells@chromium.org>
Reviewed-by: default avatarIan Wells <iwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829806}
parent 776a4b62
......@@ -8,4 +8,4 @@ Commits that don't touch these files do not cause changes here.
The hash below represents the last commit from that repo that was reviewed for
the potential need to merge here.
Last checked commit ID: beb9bad469adb0bac21611269c728ecfa3396dd6
Last checked commit ID: 77405b1370937094ae69af4933f3e06109dd53ba
......@@ -8,11 +8,10 @@ package feedwire1;
option optimize_for = LITE_RUNTIME;
import "components/feed/core/proto/wire/chrome_fulfillment_info.proto";
option java_package = "org.chromium.components.feed.core.proto.wire";
option java_outer_classname = "FeedQueryProto";
import "components/feed/core/proto/wire/chrome_fulfillment_info.proto";
message FeedQuery {
enum RequestReason {
// Bucket for any not listed. Should not be used (prefer adding a new
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment