OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:34:29 +0000 (13:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 21:34:29 +0000 (13:34 -0800)
Change-Id: I73a17a632843a059725334b415445cc892908dca


Trivial merge