| commit | 84a20ac12e07109f5682d77a131f25995f7c2d0e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Feb 12 23:00:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 12 23:00:21 2014 +0000 |
| tree | f06a20cc1d9687bc9ef81db86ea90b8ac91d6923 | |
| parent | 0a60bdf59a5c4eb3a07bee913855c85f8cde8731 [diff] | |
| parent | 2c32144b328e0191fa32bf342dc7eb01d6174b6e [diff] |
am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp * commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e': HACK: add 64-bit directory blacklist add support for module supported or unsupported target architectures