tree b0300ddadeb62e11a1c22c4f52543efd96a8d164
parent a55e29a4757700601e5e164cf03c868761a5f91a
author Kristian Monsen <kristianm@google.com> 1360906535 -0800
committer Kristian Monsen <kristianm@google.com> 1360906621 -0800

Fixup from merge, and compile fix due to different skia version

Change-Id: I644c5148904893a2854207f4d566395d973d4aff