commit | 4323ab3865dfeca2ecba7fd612e4ed103452b328 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Jul 23 23:35:33 2013 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 23 23:35:33 2013 +0000 |
tree | 53e875e1e2966a281e6fc8ea1c080f136a0d9f3a | |
parent | f59830ffbfbcb9bfb0109061ca54d298b7b66801 [diff] | |
parent | d736c6d053f63e4cd8dfb16c57093c67be3e18cd [diff] |
Merge "Simplify merges of the annotation code."