OSDN Git Service

am cfe75518: (-s ours) am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 13 Jun 2012 17:55:13 +0000 (10:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jun 2012 17:55:13 +0000 (10:55 -0700)
commita49b7fed9189a6fbbe3793ef1dfcefd78e30cbf1
tree73e93557aa6cf3f86476f48529e1fe99a9c09ca9
parent06d6204a2ea7dd263b718018dbb81a88b9a516d5
parentcfe75518ef23efede1359274c91c732c0ac7ccf3
am cfe75518: (-s ours) am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"

* commit 'cfe75518ef23efede1359274c91c732c0ac7ccf3':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm