OSDN Git Service

am 389f0e9b: am 615fcf00: Merge "Prevent double deletion when timer callback causes...
authorDerek Sollenberger <djsollen@google.com>
Wed, 9 Mar 2011 17:34:21 +0000 (09:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Mar 2011 17:34:21 +0000 (09:34 -0800)
* commit '389f0e9b6ac8f6a71e48062b2a92ec1b95f3bb4e':
  Prevent double deletion when timer callback causes plugin to be deleted.


Trivial merge