OSDN Git Service

Mass merge from gingerbread - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)
Change-Id: Iaa45284ab43b861aa704076779b43434fa70b378


Trivial merge