tree 44517409a0d7115d074f74c8e63d4e8625d2e3db
parent 2c694f032c1bea7003098336b32861e7b97aa9c7
parent 897a744bb7a95b2d3883004301b8e877cd5efc92
author Romain Guy <romainguy@android.com> 1258062368 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258062368 -0800

am 897a744b: am b602c328: Merge change I31c52bef into eclair

Merge commit '897a744bb7a95b2d3883004301b8e877cd5efc92' into eclair-mr2-plus-aosp

* commit '897a744bb7a95b2d3883004301b8e877cd5efc92':
  Revert change incorrectly submitted as part of change #32153.