OSDN Git Service

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


Trivial merge