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)
commitbf67936b4b23ff75f4de7976848b425d74ca2de8
tree63eb3ffeb49180e1a201b22b80fd4120668c6925
parentaea8407ad5c7e559c4cc6a05e46e37fa22f81d35
parent1a176de2f15392c4789b071d5f05ed6950807a0e
Merge changes I9d050e54,Ic487036a

* changes:
  versioner: allow static inlines that don't conflict.
  versioner: fix output.