OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 01:23:15 +0000 (17:23 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 01:23:15 +0000 (17:23 -0800)
Change-Id: I0a6441de70a779781b68c12433b2390e600c5d2e


Trivial merge