[elements] Fix merge conflict/resolution.
BUG= NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true Review URL: https://codereview.chromium.org/1865903002 Cr-Commit-Position: refs/heads/master@{#35303}
Showing
Please
register
or
sign in
to comment