From: Ian Rogers <irogers@google.com>
Date: Tue, 11 Mar 2014 23:21:21 +0000 (+0000)
Subject: am 7f6004d3: am 0f9fcaae: am 130045ba: Merge "Avoid redefinition of __STDC_CONSTANT_M... 
X-Git-Tag: android-x86-6.0-r1~104^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ddbd800b6f58b17df63d4757384434f961af64c7;p=android-x86%2Fexternal-llvm.git

am 7f6004d3: am 0f9fcaae: am 130045ba: Merge "Avoid redefinition of __STDC_CONSTANT_MACROS."

* commit '7f6004d366c1b5d2640df82313587545303781f7':
  Avoid redefinition of __STDC_CONSTANT_MACROS.
---

ddbd800b6f58b17df63d4757384434f961af64c7