OSDN Git Service

am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."
authorIan Rogers <irogers@google.com>
Thu, 6 Feb 2014 20:47:42 +0000 (20:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 20:47:42 +0000 (20:47 +0000)
commite5c96aeb8d9c9551bbe6e3fa3d6a58538865dc7d
treeae3acdb4011a4736c50f05e3520383152fadf4ef
parent16a8fd801a4c4372d966a5eea70b5f541a24be79
parent94af5fd9ff423e4de67a23ca21d5964b82a3816a
am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."

* commit '94af5fd9ff423e4de67a23ca21d5964b82a3816a':
  Avoid redefinition of __STD_FORMAT_MACROS.