From: Anthony Green <green@moxielogic.com>
Date: Fri, 14 Mar 2014 20:51:20 +0000 (-0400)
Subject: Fix merge
X-Git-Tag: v3.1~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c86d9b6cc6e16ee262844a33b40441374400758c;p=platform%2Fupstream%2Flibffi.git

Fix merge
---

c86d9b6cc6e16ee262844a33b40441374400758c
diff --cc ChangeLog
index 53b2abc,e930f53..138b5af
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  2014-03-10  Mike Hommey <mh+mozilla@glandium.org>
  
 +	* configure.ac: Allow building for mipsel with Android NDK r8.
+ 	* Makefile.am (AM_MAKEFLAGS): Replace double quotes with single quotes.
  
  2014-03-01  Anthony Green  <green@moxielogic.com>