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:53 +0000 (12:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:40:53 +0000 (12:40 -0800)
Change-Id: I99b09f1fd58b5c3119903304605ff613e1c4a665


Trivial merge