| commit | e1ee1e0e22b32173a3b1f88156ae17abae327aaf | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed May 14 21:54:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 21:54:30 2014 +0000 |
| tree | 471a2410e91bcabb4c85cb2aebe9692800b83eb3 | |
| parent | 137f4bc879e35563463c3eef7f217030e6e952d1 [diff] | |
| parent | 4ced8c12f9e18a72f120ffef58f9f427ea7b8c10 [diff] |
am 4ced8c12: am fc265f47: am 5493f0b5: Merge "64-bit build fix." * commit '4ced8c12f9e18a72f120ffef58f9f427ea7b8c10': 64-bit build fix.