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)
Change-Id: If84e27b805642bf5a1b0ca11f4c9c5dc40b0c6af


Trivial merge