OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 21:54:51 +0000 (14:54 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 21:54:51 +0000 (14:54 -0700)
Change-Id: I4096d2f5090e7b8451c5eca45e3692b5bc37cfff


Trivial merge