tree f1d846a828c1221ddc9300f0348b3614b51c8a64
parent cf6125c2d30ce02d8ab6cbe8e37a20f6a831e216
parent ee083eb5737c90eae85c5de2572e15bf084fdfc9
author The Android Open Source Project <initial-contribution@android.com> 1296420118 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420118 -0800

Mass merge from gingerbread - do not merge

Change-Id: I9111f11e0f85577b96556a5f996bf81b4f997de9