| commit | 3a02873cd551210ce887b2de291c4694ff156480 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jan 27 22:38:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 22:38:07 2014 +0000 |
| tree | 657a44e7dc5b3506d3e95446f6990a7111cc9d2f | |
| parent | 643e4938cc029489aaf8e010914e3bc129187b65 [diff] | |
| parent | e41370ac58669544f6a8bebfef30069d65c8253f [diff] |
am e41370ac: am b4522d54: Merge "fix compiling against 64-bit bionic" * commit 'e41370ac58669544f6a8bebfef30069d65c8253f': fix compiling against 64-bit bionic