OSDN Git Service

am 05fa5fd5: Merge "Simplify merges of the annotation code."
authorElliott Hughes <enh@google.com>
Tue, 23 Jul 2013 23:37:57 +0000 (16:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Jul 2013 23:37:57 +0000 (16:37 -0700)
commitbeeeb78893dded91597a82b6dd9a7e4960f7549b
treea5205c9e2a4761bab95f3809ed5acd3c66bb46c7
parent6986ad0343ebe4a7379a6d726005fa550b186b5d
parent05fa5fd5ce0921e8e2a8da5114c5b557434a28db
am 05fa5fd5: Merge "Simplify merges of the annotation code."

* commit '05fa5fd5ce0921e8e2a8da5114c5b557434a28db':
  Simplify merges of the annotation code.