| commit | 5e69713a1d153304cae91038d2e5c2722a74311d | [log] [tgz] |
|---|---|---|
| author | Tom Hudson <tomhudson@google.com> | Wed Jun 24 15:03:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 15:03:04 2015 +0000 |
| tree | 3b19bdf4b7cfea3382f55ffa00415330a37cfc2e | |
| parent | 4f48b435cefa07d722225d74eccfafc0c0091ba8 [diff] | |
| parent | a81a0c86473e49df331cc2f6bdcefa980e3c1ec2 [diff] |
am a81a0c86: Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev * commit 'a81a0c86473e49df331cc2f6bdcefa980e3c1ec2': Sync canvas proxy CTM (b/21945972)