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)
commit05fa5fd5ce0921e8e2a8da5114c5b557434a28db
tree751003cdb40b2dcab01fe29b0ce47d6b35e58333
parentbc03380a9d5565cdef0c4b4c41fdd19813b05799
parentee817c75a2afbdf3d6ce05b4bf0326215135025c
Merge "Simplify merges of the annotation code."