OSDN Git Service

am 08f6d7c9: am 427d438d: am da2c0a70: Merge changes Ib87855e8,I4b46ae20,I66364a5c...
authorColin Cross <ccross@android.com>
Thu, 5 Feb 2015 20:15:12 +0000 (20:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Feb 2015 20:15:12 +0000 (20:15 +0000)
commitd6e87b1903d20060e3f58228c1b845676587ce47
tree3b8f7588cbc56333838177dfff7186e4908ba013
parentf23174dab26f28b12f0f014027bf46e5256ceb40
parent08f6d7c9eb5fbd921b44ab6a6c63b4eb9fa3ac95
am 08f6d7c9: am 427d438d: am da2c0a70: Merge changes Ib87855e8,I4b46ae20,I66364a5c,Id3fcf680

* commit '08f6d7c9eb5fbd921b44ab6a6c63b4eb9fa3ac95':
  Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
  Fix typo in cpu variant makefile depenendency for arm64
  Remove libc_static_common_src_files
  Share LP32 makefile settings between arches