Merge commit 'a578b0407dc983aecd72028e1127062689b67089'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 20:19:47 +0000 (22:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 20:20:53 +0000 (22:20 +0200)
commit6be71e9955954422227f9691b4f5367a7169b099
treeb33c9eb2869353b11179ebae91ae65943f66b2a6
parentd6676a16057576e1a0ee66ae89963ec54f632919
parenta578b0407dc983aecd72028e1127062689b67089
Merge commit 'a578b0407dc983aecd72028e1127062689b67089'

* commit 'a578b0407dc983aecd72028e1127062689b67089':
  configure: Assume runtime cpu detection on arm on --target-os=android as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure