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)
commita9ac4d04f55f4534b27b205a89979dbb0ebc124f
tree32702cdff2579ee3b3cdaa693a094fedc8b334cb
parent3d05f9cfbd996f52c0bd6307a80beaabc4e58140
parent91f7fab20b9fd783e66591acfb683c568d1b1eed
Mass merge from gingerbread - do not merge

Change-Id: I99b09f1fd58b5c3119903304605ff613e1c4a665