OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 02:29:33 +0000 (19:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Sep 2010 02:29:33 +0000 (19:29 -0700)
commit686a13aad51ec8374ae33162980459aaf9ace2c5
treeddd1693980af58bb795910cf47d462793322e909
parent3fef5682a6a01b0f1d80a04b278a86ac888ca36f
parentff5d848f32348b124680ec668361dbf91610dc3a
merge from open-source master

Change-Id: Id0e5d83d78ebe2bde482fa60acda7f80220bced5