OSDN Git Service

am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid redefinition of __STD_FORMAT_MACROS."
authorIan Rogers <irogers@google.com>
Fri, 21 Feb 2014 21:51:44 +0000 (13:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 21:51:44 +0000 (13:51 -0800)
* commit '877a6e141800bbf7468ea237f98c01823d0abe0a':


Trivial merge