tree 34610fc23efedf902d535e8dcc933dacae3297c9
parent f223486fd919551e05b8d0bb241422907e2e6f57
parent 3502c5cc736f131674147ed19f1942f83f5fb9a4
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1479750279 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1479750279 +0000

Merge "Use ptr diff to encode function and padding." into master-skia

https://skia.googlesource.com/skia/+/3502c5cc736f131674147ed19f1942f83f5fb9a4

Change-Id: I8db912176ba15b8a16af6b94a41a0f3df2f55975