OSDN Git Service

am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair
authorCary Clark <cary@android.com>
Fri, 6 Nov 2009 19:29:40 +0000 (11:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Nov 2009 19:29:40 +0000 (11:29 -0800)
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here:


Trivial merge