tree 07247942c2b069e77f67f17a4eddff7666a020d9
parent 54977db25a46edb0fb0467a41498e6aad8380acc
parent 8225c5b3d925324dac7703fba0fd5a0f126afed6
author Derek Sollenberger <djsollen@google.com> 1365596321 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365596321 -0700

am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev

* commit '8225c5b3d925324dac7703fba0fd5a0f126afed6':
  Ensure that a canvas is always backed by some form of SkDevice.