| commit | 0da82a6f0d5b7f6466aa4622fc4cf1547f208499 | [log] [tgz] | 
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Jan 28 02:29:37 2014 +0000 | 
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 28 02:29:37 2014 +0000 | 
| tree | 70d7f9ca7cc0ba61a57695817b9ab81e301a6a94 | |
| parent | dec678dbd240e5c53afac8c3901d5beb23706378 [diff] | |
| parent | 689a7f30ccd2e57eaadecedbe30690e2a44ce23a [diff] | 
am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit" * commit '689a7f30ccd2e57eaadecedbe30690e2a44ce23a': Make libEGL build cleanly under 64-bit