OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Nov 2010 02:15:01 +0000 (18:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Nov 2010 02:15:01 +0000 (18:15 -0800)
commita5d3ec5ea4e48089f2ef66bcf9eb1a9d49848de6
treea8e32a6e07976464f849903116c8dcfba1ddf590
parent9de30cae010889d19ffac7b2bae746167f3a0f9d
parent6c88ff3409763cac0d757bbcdf8f09d2bb5fda9e
merge from open-source master

Change-Id: I4844f547041c66d7ea4b039c524e8eada9a6ec07