OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 05:08:47 +0000 (22:08 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 05:08:47 +0000 (22:08 -0700)
Change-Id: I53dfece757737196cf3b07f9d02852897fe95ae5


Trivial merge