tree 0bfd04f34b78bfc85e00c71765ee76dd0015613e
parent ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e
parent 3de8ed6c88db2dc274457de7890e223eccabccf3
author Android (Google) Code Review <android-gerrit@google.com> 1257919400 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1257919400 -0800

Merge change I4db11d50 into eclair

* changes:
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.