• Carlos Knippschild's avatar
    Merging latest changes from the Feed repo up to 5c177df. · 8ede3516
    Carlos Knippschild authored
    This merge includes the following commits:
    
    commit 5c177dff913851f5adaf4c536c67154c4c1041a7
    Author:     Dan Anderson <danrand@google.com>
    AuthorDate: Tue Jul 28 12:29:32 2020 -0700
    Commit:     Copybara-Service <copybara-worker@google.com>
    CommitDate: Tue Jul 28 12:30:21 2020 -0700
    
        Adds ActionSurface to feed_action.proto
    
        PiperOrigin-RevId: 323628979
        Change-Id: Ia0e187327c6720e225b2c54f35ca23df73c08d2d
    
    Change-Id: I22e19a8cb9a2dbf7fb6ec2c08aab706cc643bdb4
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343555
    Auto-Submit: Carlos Knippschild <carlosk@chromium.org>
    Reviewed-by: default avatarDan H <harringtond@chromium.org>
    Commit-Queue: Dan H <harringtond@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#796198}
    8ede3516
merging.md 566 Bytes