OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 6 Nov 2010 01:14:03 +0000 (18:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 6 Nov 2010 01:14:03 +0000 (18:14 -0700)
Change-Id: I82e33d808bac10d4f63b5379ee9367091865fde3


Trivial merge