OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Dec 2010 04:17:29 +0000 (20:17 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Dec 2010 04:17:29 +0000 (20:17 -0800)
commitf2bf9cde2b0080fafe2d03877beadbb2f206472f
tree24c0646c18a4e65c76cf4c7d18a7b2f500acc760
parent99dd5392e2acef4d2f0dcecebdd5c5ecdac34b9e
parent632cb06abcf0af0dec812804efd6168978e637c2
merge from open-source master

Change-Id: I9a3685de13e5b1c4e03cd2d82f879cd7f1ca8135