OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 25 Mar 2010 23:39:32 +0000 (16:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 25 Mar 2010 23:39:32 +0000 (16:39 -0700)
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e


Trivial merge