From: Christopher Ferris <cferris@google.com>
Date: Mon, 27 Feb 2017 20:27:45 +0000 (+0000)
Subject: Merge "Disable macro redefined warnings." am: 0a9866d60b am: 9bbfd91413
X-Git-Tag: android-x86-8.1-r1~25
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a34e277b6a60813aeb8e642e7670f538493e0c4;p=android-x86%2Fexternal-e2fsprogs.git

Merge "Disable macro redefined warnings." am: 0a9866d60b am: 9bbfd91413
am: a091d1cfbf

Change-Id: I2077cce88a448ed86bb85b39cba767f930a287e3
---

4a34e277b6a60813aeb8e642e7670f538493e0c4