OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:59:03 +0000 (18:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:59:03 +0000 (18:59 -0700)
Change-Id: I19aead365e0e65b12dd92c0b9ae4b8cc8ff60bdf


Trivial merge