OSDN Git Service

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


Trivial merge