| commit | 5a2fc9c912510c65504a548f2b26328d11017059 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 16:37:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 16:37:58 2013 -0700 |
| tree | 16d8bb9f15d41cc271da50697ecc7886905cb8ca | |
| parent | 73599f39d3c9b14f0c698413c4b6be0357f156f6 [diff] | |
| parent | 4323ab3865dfeca2ecba7fd612e4ed103452b328 [diff] |
am 4323ab38: Merge "Simplify merges of the annotation code." * commit '4323ab3865dfeca2ecba7fd612e4ed103452b328': Simplify merges of the annotation code.