OSDN Git Service

Merge "Fix build."
authorNarayan Kamath <narayan@google.com>
Fri, 30 May 2014 11:08:38 +0000 (11:08 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 30 May 2014 11:08:39 +0000 (11:08 +0000)
commitd87ca14e850d6cc029419fef41f9212907bda2bf
tree238f10a7578f5133769db6465fa8d7a0d9c8e047
parentb827c44f39f66fce600408f82988d6e154627ba7
parentfd5a852e49796374899772381f15c9033dae0057
Merge "Fix build."