OSDN Git Service

am 0c8e5e4f: am 7de9c005: am 2ef279b3: am 8d2ad1af: Avoid redefinition of __STD_FORMA...
authorIan Rogers <irogers@google.com>
Sat, 22 Feb 2014 00:52:05 +0000 (00:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:52:05 +0000 (00:52 +0000)
* commit '0c8e5e4f30133e1389f4dbde54ab119a4fd873fb':


Trivial merge