[elements] Fix merge conflict/resolution.

[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true

Committed: https://crrev.com/b8cfe6853d82964b6cb96c787aa770b032c8cdee
Cr-Commit-Position: refs/heads/master@{#35303}

[Camillo Bruni, 2016-04-06 13:48:23]

cbruni@chromium.org changed reviewers:
+ machenbach@chromium.org, verwaest@chromium.org

[Camillo Bruni, 2016-04-06 13:48:24]

PTAL

[Toon Verwaest, 2016-04-06 13:50:34]

lgtm

[Michael Achenbach, 2016-04-06 13:50:44]

Description was changed from

==========
[elements] Fix merge conflict/resolution.
BUG=
==========

to

==========
[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
==========

[Camillo Bruni, 2016-04-06 13:51:05]

The CQ bit was checked by cbruni@chromium.org

[commit-bot: I haz the power, 2016-04-06 13:51:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1865903002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1865903002/1

[commit-bot: I haz the power, 2016-04-06 13:51:30]

Description was changed from

==========
[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
==========

to

==========
[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
==========

[commit-bot: I haz the power, 2016-04-06 13:51:31]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-04-06 13:53:28]

Description was changed from

==========
[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
==========

to

==========
[elements] Fix merge conflict/resolution.
BUG=

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true

Committed: https://crrev.com/b8cfe6853d82964b6cb96c787aa770b032c8cdee
Cr-Commit-Position: refs/heads/master@{#35303}
==========

[commit-bot: I haz the power, 2016-04-06 13:53:29]

Patchset 1 (id:??) landed as
https://crrev.com/b8cfe6853d82964b6cb96c787aa770b032c8cdee
Cr-Commit-Position: refs/heads/master@{#35303}