OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Dec 2010 02:20:45 +0000 (18:20 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Dec 2010 02:20:45 +0000 (18:20 -0800)
commit255a95102fc73d7cec0597da109c5b59dbcf7125
tree0967cf84f423f0684ae46541aca8dcab3520e7c5
parent452a5b706f1986ec727b4af876f5ac836d6ba1ce
parentaf662c43db539dea46d1773a1287ed950375dff4
merge from open-source master

Change-Id: If84e27b805642bf5a1b0ca11f4c9c5dc40b0c6af