OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:46:08 +0000 (10:46 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:46:08 +0000 (10:46 -0700)
Change-Id: If0dab193ba393de8b8a8cc2007c2c9c36fa745b6


Trivial merge