OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:14:16 +0000 (13:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:14:30 +0000 (13:14 -0700)
commitf56e9165d9ba2984dc2534c9c19bc33b48f17cab
tree2a35f8e01dc5adc66bb622971fcd7d01e892672c
parent4873d8f5ca9fecc9c826ad383befbefb3407296b
parent64947314b74cc280928628614a4434c0b5c5dfb6
merge from open-source master

Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa