Merge "Fix a clang/win build error"
authorYunqing Wang <yunqingwang@google.com>
Tue, 26 Jan 2016 19:00:06 +0000 (19:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 26 Jan 2016 19:00:06 +0000 (19:00 +0000)
commitd6996849f0c65b97c40318647c3e7dc2db332861
tree31d47a67101c760bbc137fb2e056013681832d39
parentfa0f25891fdb4e187f1de6c4a494f9f4b1b49744
parente6f05e78fe3c9d4a82aace32bc0996cc71a5ff29
Merge "Fix a clang/win build error"