OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Sep 2010 01:01:23 +0000 (18:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Sep 2010 01:01:23 +0000 (18:01 -0700)
Change-Id: I01eb95ad2873643098d75d58f843c7aa26ed56b2


Trivial merge