OSDN Git Service

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


Trivial merge