OSDN Git Service

Merge "Fix windows build"
authorColin Cross <ccross@android.com>
Sat, 26 Sep 2015 00:09:58 +0000 (00:09 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 26 Sep 2015 00:09:58 +0000 (00:09 +0000)
commitaaa9d8dc0aba0446fb11238f2aa869ce0b33df2f
tree8106dd1cc17096d55233bf9aeaf4b74785f16b6e
parent67020d2338dd51af5daa3479624acaa494be51a9
parent309b420d56fc9093fdb77c3962ab13bf75cc99a6
Merge "Fix windows build"