tree 735a5972d43b29a2395fc73f61c0254b55331bef
parent bbc6f36144817697d218e98327335d936e29d210
parent fff055cc5f9ca5015678f4f13a4f842084bd62d5
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1455201273 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1455201273 +0000

Merge "SkHalfToFloat_01 / SkFloatToHalf_01" into master-skia

https://skia.googlesource.com/skia/+/fff055cc5f9ca5015678f4f13a4f842084bd62d5

Change-Id: Id82227a89609f602e9b321f8acdd4187c9f9d621