tree 4f6a146a4a69ee1d0fe02a168056a59c205149e9
parent daafd5441af5a180edd20d6edf74a9bd8117a287
parent b602c328c24f82d61038ac1222bd40a3cc7bc900
author Romain Guy <romainguy@android.com> 1258062120 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258062120 -0800

am b602c328: Merge change I31c52bef into eclair

Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2

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