OSDN Git Service

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


Trivial merge