OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 18:11:34 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 18:11:34 +0000 (10:11 -0800)
commit3cba1051d810bf7fbdf12b8257b423f0a9b990c1
tree9cccf98b959a627757056e46ef5623c179c5c9af
parentbf1d672b46414c648f76f3e9cdfb35d1a28bc5f1
parentb6204ac4793977976372b8a964fd6289715ed859
merge from open-source master

Change-Id: I5cf9142f6fa6b876fcdc01446dda8c8d98fed25c