OSDN Git Service

am 7f6004d3: am 0f9fcaae: am 130045ba: Merge "Avoid redefinition of __STDC_CONSTANT_M...
authorIan Rogers <irogers@google.com>
Tue, 11 Mar 2014 23:21:21 +0000 (23:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 23:21:21 +0000 (23:21 +0000)
* commit '7f6004d366c1b5d2640df82313587545303781f7':
  Avoid redefinition of __STDC_CONSTANT_MACROS.


Trivial merge