tree da8ba37a0585ce520d9417c801ac87aeca0b704b
parent f4b4eb2d717e1acaf49ecb3f63ba25107ee9717c
author Karl Klose <karlklose@google.com> 1437465624 +0200
committer Karl Klose <karlklose@google.com> 1437465624 +0200

Fix merge error in commit 0869c5ca4ab1dd1b1fcdffd8414d49de3c664daa.

TBR=lrn@google.com

Review URL: https://codereview.chromium.org//1244743003 .