tree 791b558fe078e199d0063d29beebd42d9da3de7d
parent 7eaac4336c6feeabdb1bfdb390865571f73e9a51
parent 42196fd10398c7250af364c0563893d209c8cc15
author The Android Open Source Project <initial-contribution@android.com> 1295908473 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295908473 -0800

am 42196fd1: am cdffe35c: merge from gingerbread

* commit '42196fd10398c7250af364c0563893d209c8cc15':