OSDN Git Service

Merge "Fix build."
authorBrian Carlstrom <bdc@google.com>
Sat, 15 Mar 2014 00:57:39 +0000 (00:57 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 15 Mar 2014 00:57:39 +0000 (00:57 +0000)
commit38378b28675d154cc50074396a6216df14542454
tree47debd0a35b23815b21913bd44cb315cb057290f
parentd8cc0f874db21a0945c0ee7198bb2ae4a973f70a
parent420fd041cc3502cd9d2c1158b858d0189c0c481f
Merge "Fix build."