OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Nov 2010 02:15:01 +0000 (18:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Nov 2010 02:15:01 +0000 (18:15 -0800)
Change-Id: I4844f547041c66d7ea4b039c524e8eada9a6ec07


Trivial merge