| commit | 05fa5fd5ce0921e8e2a8da5114c5b557434a28db | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 23:35:35 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 23 23:35:35 2013 +0000 |
| tree | 751003cdb40b2dcab01fe29b0ce47d6b35e58333 | |
| parent | bc03380a9d5565cdef0c4b4c41fdd19813b05799 [diff] | |
| parent | ee817c75a2afbdf3d6ce05b4bf0326215135025c [diff] |
Merge "Simplify merges of the annotation code."