OSDN Git Service

am 12969fbe: am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefin...
authorIan Rogers <irogers@google.com>
Sat, 22 Feb 2014 00:46:59 +0000 (00:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:46:59 +0000 (00:46 +0000)
commit47de7d9dcbc7955a1f361f6dc24ee53c3610de8a
tree8f02333ed1c91d8a7ac8b6d9badc3098b927e7bf
parent17ee97d84ddb8a8dec4e3ebc612f4f1523bb1e3b
parent12969fbe106103116f912a053d1e2716f9adda00
am 12969fbe: am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."

* commit '12969fbe106103116f912a053d1e2716f9adda00':