tree 9e346227a3e6ea9d18de631e0fec018d2ccc2df5
parent 96935a834eeb91465c7b48cdfa49e73eb39596fc
parent 5e69713a1d153304cae91038d2e5c2722a74311d
author Tom Hudson <tomhudson@google.com> 1435158601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435158601 +0000

am 5e69713a: am a81a0c86: Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev

* commit '5e69713a1d153304cae91038d2e5c2722a74311d':
  Sync canvas proxy CTM (b/21945972)