OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:48:45 +0000 (10:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:48:45 +0000 (10:48 -0700)
commit0e78f786777a04af498b43564a8d6ed8e15e8940
treeb156d1bf2c5efdcb6af23294baac4161daf5ede4
parent611793d6abcf504544d6ebccb8c46da06464b701
parentfc6d95b10e7629f61013d221cbc1cdbff0190ac0
merge from open-source master

Change-Id: Id84ff747889d6f2c15c0510263e32fdfdd18dbed