OSDN Git Service

Merge "Re-enable OSR."
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 12 Feb 2016 13:25:56 +0000 (13:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 12 Feb 2016 13:25:56 +0000 (13:25 +0000)

Trivial merge