OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 00:52:46 +0000 (17:52 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 00:52:46 +0000 (17:52 -0700)
Change-Id: I05af4707413ca01e4a26750f25371e11ffa35da5


Trivial merge