• Carlos Knippschild's avatar
    Merging latest changes from the Feed repo up to 8fb7fd9. · f31e0231
    Carlos Knippschild authored
    This merge includes the following commits:
    
    commit 8fb7fd9a80f7512cb78178b83f017d82d04f9b14
    Author:     Feed Team <no-reply@google.com>
    AuthorDate: Tue Jun 30 11:24:37 2020 -0700
    Commit:     Copybara-Service <copybara-worker@google.com>
    CommitDate: Tue Jun 30 11:25:14 2020 -0700
    
        Re-add action origin filed to feed_action. This field is meant to help analyze how many actions are coming from the client side action cache versus from the active session. This will also help debug how the clients are generating duplicate actions.
    
        PiperOrigin-RevId: 319061509
        Change-Id: I31da37eed03b1e8b6036b12bb4000fa7e0768455
    
    commit ea5ee1a066f16148bbbe2a687d8316d563b40a57
    Author:     Travis Feuling <feuling@google.com>
    AuthorDate: Tue Jun 30 09:55:58 2020 -0700
    Commit:     Copybara-Service <copybara-worker@google.com>
    CommitDate: Tue Jun 30 09:56:32 2020 -0700
    
        Export script changes.
    
        PiperOrigin-RevId: 319041793
        Change-Id: I46c2620b393633fee751691b6d49953c9c55c03c
    
    Change-Id: Id516f309a883219c2918ee2a3b8e01efb4fc5ee2
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2278608
    Auto-Submit: Carlos Knippschild <carlosk@chromium.org>
    Reviewed-by: default avatarJustin DeWitt <dewittj@chromium.org>
    Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#785896}
    f31e0231
merging.md 566 Bytes