OSDN Git Service

am 92c9a6fe: am 5553de61: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:26:17 +0000 (14:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:26:17 +0000 (14:26 -0800)
commit98d4f1fa4373a89766888357d891b6509456ee71
tree8c0300111a5401c8988331e9ef61e72ba4440a62
parenteb13a6f5b0a3327caf115fad343d8319cff9e5c9
parent92c9a6fe2e5a576de50d08e08a332a774f4cf2d4
am 92c9a6fe: am 5553de61: reconcile main tree with open-source eclair

Merge commit '92c9a6fe2e5a576de50d08e08a332a774f4cf2d4'

* commit '92c9a6fe2e5a576de50d08e08a332a774f4cf2d4':
  android-2.1_r1 snapshot