tree 0d109f511ed768747a529bb75a772e9be604ba9e
parent d8ee0c22b1bd5a7f0e37f41d68e868d5077fe92b
parent 7c7fa1b51bec497cd7f46c1bdb5bb0adfaa181b2
author Eric Laurent <elaurent@google.com> 1266865988 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266865988 -0800

am f5fe3949: Fix issue 2459650.

Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp

* commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b':
  Fix issue 2459650.