tree a3b5c436ddb1136d78d56bb78373fcbd967c7a2e
parent 6c5e7e16858ec99921f84118e253bfbfb45e4f4a
parent fbbe5ab5255f68cc9f0f10f36f680719b82955b6
author The Android Open Source Project <initial-contribution@android.com> 1295908649 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295908649 -0800

am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbread

* commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6':