| commit | d736c6d053f63e4cd8dfb16c57093c67be3e18cd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 16:17:52 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jul 23 16:17:52 2013 -0700 |
| tree | 53e875e1e2966a281e6fc8ea1c080f136a0d9f3a | |
| parent | f59830ffbfbcb9bfb0109061ca54d298b7b66801 [diff] |
Simplify merges of the annotation code. Change-Id: Ifb43ae14efcbfad1da600f97e3b3763ad9764b1f