| commit | ddea3ca78d4927ba52b6c01e19d74dc4a0c973d2 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Mon Mar 24 17:38:14 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 17:38:14 2014 -0700 |
| tree | 9907d42178ac8f1cfcd1a438b9d198f472b9dd2b | |
| parent | f9bb081db3303ccc3324ea3bfe7e7a42366100e9 [diff] | |
| parent | 29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5 [diff] |
am 29e4cf0a: am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit * commit '29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5': DO NOT MERGE change Surface constructor arg to 64bit