| commit | 1a6e29aae589073bfd6bd5f42816e622584cfb7a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Jan 29 15:38:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 29 15:38:42 2014 +0000 |
| tree | 2c07f35a29437f6003bc1ff324340eb022a334f1 | |
| parent | 1caea796c9f3154048c02db6f46c458e8a80c32c [diff] | |
| parent | d933edc742dcaf96862b211f4641e4cfd98acef5 [diff] |
am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int." * commit 'd933edc742dcaf96862b211f4641e4cfd98acef5': mNativeCanvas is long, not int.