Fix merge
authorAnthony Green <green@moxielogic.com>
Fri, 14 Mar 2014 20:51:20 +0000 (16:51 -0400)
committerAnthony Green <green@moxielogic.com>
Fri, 14 Mar 2014 20:51:20 +0000 (16:51 -0400)
1  2 
ChangeLog

diff --cc ChangeLog
index 53b2abc8db84a1b827569922534d2d83e615c3bf,e930f53fde6e827c649d2a1cdeb4e39fd20f4286..138b5af596efa51a7beb543e1d9ff4b054c6af93
+++ 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>