OSDN Git Service

Merge "Simplify merges of the annotation code."
authorElliott Hughes <enh@google.com>
Tue, 23 Jul 2013 23:35:35 +0000 (23:35 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 23 Jul 2013 23:35:35 +0000 (23:35 +0000)

Trivial merge