tree 30fa9c61a1de829fcca9b44bfc71212e0ac24655
parent ba591c175696e7c7b8bfab956d90c6a659c43244
parent af515cecfb68a453e301e6ba0d54b15fb15ade94
author Clay Murphy <claym@google.com> 1394592183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394592183 +0000

am af515cec: Merge "Update documentation regarding Skia and its role in Canvas."

* commit 'af515cecfb68a453e301e6ba0d54b15fb15ade94':
  Update documentation regarding Skia and its role in Canvas.