OSDN Git Service

am 030df428: am 85762123: Merge change 24584 into eclair
authorXavier Ducrohet <xav@android.com>
Thu, 10 Sep 2009 22:19:55 +0000 (15:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Sep 2009 22:19:55 +0000 (15:19 -0700)
commita4faa18b6f6b2bf4d16e8eb5cd1779388e2b59eb
tree6b30f2588473d6d9f526e51e6687ee68541f659f
parentc35eaf7e9893e1afa5f78d2ed7eca609b1159ddb
parent030df428443735eed084286564407198792daa82
am 030df428: am 85762123: Merge change 24584 into eclair

Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.