| commit | 6443630ccaa5866a9181f869d4f21ddc728d2f7e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Mar 27 00:14:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 00:14:05 2014 +0000 |
| tree | 1d56dfb4ef1f13ebd1d530005d1a6f5484bac4f7 | |
| parent | 86c0cf68c843ae5a920d40b5c3ec3d6891ebb337 [diff] | |
| parent | 441e9452488ccb98f7b0a7690b86fcdff733e5f0 [diff] |
am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp * commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0': add support for LOCAL_MULTILIB