| commit | beeeb78893dded91597a82b6dd9a7e4960f7549b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 16:37:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 16:37:57 2013 -0700 |
| tree | a5205c9e2a4761bab95f3809ed5acd3c66bb46c7 | |
| parent | 6986ad0343ebe4a7379a6d726005fa550b186b5d [diff] | |
| parent | 05fa5fd5ce0921e8e2a8da5114c5b557434a28db [diff] |
am 05fa5fd5: Merge "Simplify merges of the annotation code." * commit '05fa5fd5ce0921e8e2a8da5114c5b557434a28db': Simplify merges of the annotation code.