| commit | 39d39f8ce915d8de72101e2c3b38ebec94847c6b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 13 10:59:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 13 10:59:56 2012 -0700 |
| tree | ea80c50e405014ef906f50ce66c9d2e4d719cfc7 | |
| parent | 14584f1b6dbd6c3baf6da13b089427d177b50378 [diff] | |
| parent | a49b7fed9189a6fbbe3793ef1dfcefd78e30cbf1 [diff] |
am a49b7fed: am cfe75518: (-s ours) am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm" * commit 'a49b7fed9189a6fbbe3793ef1dfcefd78e30cbf1': Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm