OSDN Git Service

am 3b79b5bf: Merge "Don\'t duplicate annotation set ref lists when merging."
authorElliott Hughes <enh@google.com>
Thu, 25 Apr 2013 18:50:36 +0000 (11:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Apr 2013 18:50:36 +0000 (11:50 -0700)
commit32652a25dd2e67c0931d7cbaeb48c80f4ff95131
treed4ac4bd0bc7c5774a4571ab1b81f63141830e8c2
parentbdcaa60b82002bed3465f54bb63117aef250a67f
parent3b79b5bf70941a6da52ea8c5d50b0dcdb296a99f
am 3b79b5bf: Merge "Don\'t duplicate annotation set ref lists when merging."

* commit '3b79b5bf70941a6da52ea8c5d50b0dcdb296a99f':
  Don't duplicate annotation set ref lists when merging.