tree 568330547d18bc29b5e5fc43c8406c46e0371b76
parent 8e2ff164cc327aad8666333a1d75f86291858da0
parent b0350d9b22f326379858555f31be264ed799c7f3
author The Android Open Source Project <initial-contribution@android.com> 1296419983 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296419983 -0800

Mass merge from gingerbread - do not merge

Change-Id: I105c2c728aef42629dbb44af8e3d1044c4ae1e97