OSDN Git Service

Merge changes I9d050e54,Ic487036a
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 4 Nov 2016 23:06:55 +0000 (23:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 4 Nov 2016 23:06:55 +0000 (23:06 +0000)
* changes:
  versioner: allow static inlines that don't conflict.
  versioner: fix output.


Trivial merge