OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 16:54:25 +0000 (09:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 16:54:25 +0000 (09:54 -0700)
commit2f3a5ed5aa4797931a1885c635c370ca14ef5260
tree26a91837335749678d9e656dba22424f0a0ff1ab
parent8090d9e669150ccb7eb3c5c4ef2261a80d7cc6c0
parentec9c20691be1b98bd98aa844c1d65158c65572f4
merge from open-source master

Change-Id: I83cf28d9bdef00e1f1ac5b1663e2faeeba0930ea