| commit | 55e7e8ac6bf34c75461f416b0a8249b023318872 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 23 16:43:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 16:43:14 2013 -0700 |
| tree | 2ae7753b9cbb2c6c0afe306c2fefa342f7efdc72 | |
| parent | 6026dc7ec6103182fb2a40fc03e9d6eb5fe94c2a [diff] | |
| parent | 5a2fc9c912510c65504a548f2b26328d11017059 [diff] |
am 5a2fc9c9: am 4323ab38: Merge "Simplify merges of the annotation code." * commit '5a2fc9c912510c65504a548f2b26328d11017059': Simplify merges of the annotation code.