OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:30:08 +0000 (08:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:30:08 +0000 (08:30 -0700)
commit50c7f2d92a8100982c49027058fb05069e4a1e2a
treebea0b1522d803732ddaa5ddeda0d857d363cca0b
parentfcc577b2a15c37c1bbed995c27a48594dc43dfef
parentde6007cbf839a6842243a09e93dc7840e30a822c
merge from open-source master

Change-Id: I5698914cf9093696ad851412a510a99419989d17