commit | fc265f47302bfa1c2b886b39ea111565fe7102ed | [log] [tgz] |
---|---|---|
author | Ian Rogers <irogers@google.com> | Wed May 14 21:42:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 21:42:23 2014 +0000 |
tree | 7c0b9cc7c0640ec43d1774120c4bc080d63c3235 | |
parent | 8f4d720aa0fd72ad1846e129fc0dc1f11729d2a1 [diff] | |
parent | 5493f0b59b31453c725a32da7de3b6b60c3df713 [diff] |
am 5493f0b5: Merge "64-bit build fix." * commit '5493f0b59b31453c725a32da7de3b6b60c3df713': 64-bit build fix.