tree 4927eebb947181d9b9b11f3e0d1f9289fd380ca0
parent 83feceaa59cf80631c15e4c177e856c1bd5a2b06
parent 6e87913ab991f0aa41e51647314b5cfbda581273
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1421329405 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> 1421329405 +0000

Merge "Update SKP version" into master-skia

https://skia.googlesource.com/skia/+/6e87913ab991f0aa41e51647314b5cfbda581273

Change-Id: I3ebaef045d82ae478b5303fb15d2f0e85821800a