| commit | 707b0b22f17f3ed6694542cd557c361db4d9fab8 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jun 17 17:06:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 17:06:08 2014 +0000 |
| tree | dea934d3e5cc11608cc1a8c4e8d351f4137de99f | |
| parent | ff768c27d42bb6039eff36e566b27222f00fca31 [diff] | |
| parent | 88f8d6aba74d98f5667bf7c7ae7d1095dace9873 [diff] |
am 88f8d6ab: Merge "resolve merge conflicts of c5f5903 to master." * commit '88f8d6aba74d98f5667bf7c7ae7d1095dace9873': android/utils/host_bitness.c: android_getHostBitness()