Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 11:13:21 +0000 (13:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 11:13:47 +0000 (13:13 +0200)
commit8a4a84a70a2e0bcfadcc955493c94be8f3ca8ce9
tree9b59d06945bb5b3b022b16128099fb702fd0f8d4
parent60058c1880f2260ad8a900d54a89a3f2cb4aa4ac
parent83aa4fc3feec7389ac781fece1e994f2dfd7ebdb
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

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