| commit | 5e01112e70df52be0666658e578c59db5d1c378f | [log] [tgz] |
|---|---|---|
| author | Richard Coles <torne@google.com> | Tue Dec 10 01:48:03 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:48:03 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | c32b834a238e9d6bea7bf5c1afb807300cbb0d5e [diff] | |
| parent | 030d0181f4d031a2e2630d323a8168a19fcb0f15 [diff] |
am 030d0181: (-s ours) am 772f35d4: Merge "Cherry-pick: Android: disable 2d canvas AA in a different place." into klp-dev * commit '030d0181f4d031a2e2630d323a8168a19fcb0f15':