OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Jul 2010 19:17:17 +0000 (12:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Jul 2010 19:17:17 +0000 (12:17 -0700)
commit77ec41cc22cf0d08e556e6afe4de1f6eae5e9662
treea8078944e467af1c0d9fdb2888653b8b44c949fc
parent90e83bcc1c41a4d6d310b2bd5cb747a53a88fff3
parente73a571fd9b60315681eacbef5857f0f0b1ece18
merge from open-source master

Change-Id: Ib65087940790a8d3b72d8d345a11e7c9c53896cd