OSDN Git Service

Merge "Fix compile-time error."
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 30 Oct 2015 12:08:30 +0000 (12:08 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 30 Oct 2015 12:08:30 +0000 (12:08 +0000)
commita5f295fcdb21c0a8e06382485250dcb4250ac442
tree2b09b2b8a97bc6890b612cd1455c8167b0b760d4
parentf31f9739e6cb06298604f5fb723db2ab9a8f2962
parentfca90a1f3b7a77778db1d2acad83af72f160be88
Merge "Fix compile-time error."