| commit | ee817c75a2afbdf3d6ce05b4bf0326215135025c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 16:17:22 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jul 23 16:17:22 2013 -0700 |
| tree | 751003cdb40b2dcab01fe29b0ce47d6b35e58333 | |
| parent | bc03380a9d5565cdef0c4b4c41fdd19813b05799 [diff] |
Simplify merges of the annotation code. Change-Id: I9fd3b53032b2e6053094500571775ed2fb5edf78