OSDN Git Service

am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of...
authorIan Rogers <irogers@google.com>
Mon, 10 Mar 2014 18:05:01 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Mar 2014 18:05:01 +0000 (18:05 +0000)
commita7a4917413cabf1955051bd980a5bac5a1421c6e
tree8f02333ed1c91d8a7ac8b6d9badc3098b927e7bf
parent549593a496d48c1de4f8bf9c8c4a235f11958d1c
parentc150d2107e21b3ce83203b848ddd7c9cc8216f67
am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."

* commit 'c150d2107e21b3ce83203b848ddd7c9cc8216f67':