| commit | 55fc54970b674280376bbf037153ca1a5e53bc32 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Jun 11 17:44:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 17:44:52 2014 +0000 |
| tree | 85c4d06c9dc60c44f51bc1f63fdc356c93b6a195 | |
| parent | b37c8c545384e358bc7f54e8c600acc399afd251 [diff] | |
| parent | 72676e7d0db89d477495245aa15f1a128b5c35bc [diff] |
am 72676e7d: am 0e1313cd: Merge "libgui: 64-bit compile issues" * commit '72676e7d0db89d477495245aa15f1a128b5c35bc': libgui: 64-bit compile issues