OSDN Git Service

am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of...
authorIan Rogers <irogers@google.com>
Sat, 22 Feb 2014 00:40:18 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:40:18 +0000 (00:40 +0000)
commit12969fbe106103116f912a053d1e2716f9adda00
tree8f02333ed1c91d8a7ac8b6d9badc3098b927e7bf
parent001b0120139a54dc1dca124b19fd14463b17955d
parentc150d2107e21b3ce83203b848ddd7c9cc8216f67
am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."

* commit 'c150d2107e21b3ce83203b848ddd7c9cc8216f67':