OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 18 Nov 2010 20:28:21 +0000 (12:28 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 18 Nov 2010 20:28:21 +0000 (12:28 -0800)
Change-Id: I41e43cb191b6cfc8177c40cb2bb191e110ad0d53


Trivial merge