tree 25c932019b5a393684f1265b3b8bdedd97d6dc88
parent f8481346c8821c0596b84e58f7e181b05a9e30c0
parent 3b42b7e746aae2e91ca8df8910d28402c192f1d5
author Eric Laurent <elaurent@google.com> 1261554119 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261554119 -0800

am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559: