OSDN Git Service

Merge "DO NOT MERGE - Allow global-merge option to be accessed externally."
authorStephen Hines <srhines@google.com>
Tue, 27 Aug 2013 22:14:35 +0000 (22:14 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 27 Aug 2013 22:14:35 +0000 (22:14 +0000)

Trivial merge