OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)
commit315583c8346c40c0a7aa73e3566295fd5a37ea81
tree532df9facad6571445d85a65fb59ba0580ea5050
parent2548cbe2ed6849bf922fec37e79bd276018f24d8
parentf6de34a2c4f5effce0f048d885d96f161c3af6b1
merge from open-source master

Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b