OSDN Git Service

am 5fdf6cf6: am 16a8fd80: Avoid redefinition of __STD_FORMAT_MACROS.
authorIan Rogers <irogers@google.com>
Fri, 21 Feb 2014 21:51:43 +0000 (13:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 21:51:43 +0000 (13:51 -0800)
* commit '5fdf6cf61a44ba69a16401890450d6afd2f189ba':
  Avoid redefinition of __STD_FORMAT_MACROS.


Trivial merge