tree 46cb3b22397186f6cf8b01b71d7cb10ac8c4b4b6
parent f268cc9b8f4610acd22684ced01150e67c737fe7
author Lei Zhang <thestig@chromium.org> 1460070634 -0700
committer Lei Zhang <thestig@chromium.org> 1460070634 -0700

Merge to M50: Fix a regression caused by 7cf13c9

BUG=591137
TBR=weili@chromium.org

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

(cherry picked from commit 258f19f26b3ccfc6b64429111a4a11bdc64be131)

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