Merge branch 'chrome/m52' into update-skia-m52
authorMatthew Leibowitz <mattleibow@live.com>
Fri, 24 Jun 2016 17:48:22 +0000 (19:48 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Fri, 24 Jun 2016 17:48:22 +0000 (19:48 +0200)

Trivial merge