OSDN Git Service

Mass merge from gingerbread - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:58 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 30 Jan 2011 20:41:58 +0000 (12:41 -0800)
commit8679c4d8ff78a460d70dd99fea2304a673d4af26
treef1d846a828c1221ddc9300f0348b3614b51c8a64
parentcf6125c2d30ce02d8ab6cbe8e37a20f6a831e216
parentee083eb5737c90eae85c5de2572e15bf084fdfc9
Mass merge from gingerbread - do not merge

Change-Id: I9111f11e0f85577b96556a5f996bf81b4f997de9