OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d6204 cfe7551)
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)
* commit 'cfe75518ef23efede1359274c91c732c0ac7ccf3':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help