OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 17:52:43 +0000 (10:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 17:52:43 +0000 (10:52 -0700)
commit04acf6c80ee1fbe64c3915da1255e8ce4e7798ce
tree573cc940580f8e2a21dd94c799367c07980eeaab
parentf201ae83fc1742f34f9b0ff248c0c6c48a55f7a4
parente8f79c1f5de7ecaf1249ee36813abd2558cacf08
merge from froyo-plus-aosp

Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d