OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:07:26 +0000 (11:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:07:26 +0000 (11:07 -0700)
commit837e886216e3b422488e35dead4bc8093e6089fd
tree418ea0128e31ead0a00e664b972871815d681bef
parent943e48579e9023b211bace7b94f90eac49353c30
parent31fc0761856393d7d2b571953fdfddc866f78760
merge from open-source master

Change-Id: I443b7b9ef2c67ff84c17755a6637e6a8fda0f2e9