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