OSDN Git Service

am 85762123: Merge change 24584 into eclair
authorXavier Ducrohet <xav@android.com>
Thu, 10 Sep 2009 22:10:39 +0000 (15:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Sep 2009 22:10:39 +0000 (15:10 -0700)
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.


Trivial merge