Merge pull request #4055 from atom/backport-1500713003
authorCheng Zhao <zcbenz@gmail.com>
Mon, 11 Jan 2016 05:24:55 +0000 (13:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 11 Jan 2016 05:24:55 +0000 (13:24 +0800)
commit76a34a27ea57a4f3494d73d678e002d4dcd6de45
tree356718499b074c352db264f28c76625a43e6d615
parent20a92d7d1e6cc2763d34038a323b84c8c6c06fc2
parent1de9cfd4ebde10e79efceb1f9abc4f2426134437
Merge pull request #4055 from atom/backport-1500713003

Backport https://codereview.chromium.org/1500713003