| commit | f7988507f48576d1455696693281b63d8ba7f478 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jun 11 19:26:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 19:26:30 2014 +0000 |
| tree | 44272e70b3889a2381b30ac976d0d081301cdf74 | |
| parent | 80d3bd158270d53c2bfbb45c53160d2e89e87e1d [diff] | |
| parent | 2d19cbd279ed69c7202f089be174c35c1585f709 [diff] |
am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp * commit '2d19cbd279ed69c7202f089be174c35c1585f709': Switch to 32-bit-by-default host multilib build.