OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 03:49:27 +0000 (19:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 03:49:27 +0000 (19:49 -0800)
Change-Id: If1ac02fd868400b7b2dfafc200c17b43f42c6aef


Trivial merge