tree 0d9407a15ecac49a6c824bf547f304a0970d82f5
parent 44400b19d6cf5aa18fd44f389ef4ec5b5a989821
parent 9e1ad1da6ba63b7bd01043466a7bcbfa4a8e704f
author Paul Westbrook <pwestbro@google.com> 1259814364 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259814364 -0800

am 9e1ad1da: am 858017f1: First part of the fix for bug 2204255

Merge commit '9e1ad1da6ba63b7bd01043466a7bcbfa4a8e704f'

* commit '9e1ad1da6ba63b7bd01043466a7bcbfa4a8e704f':
  First part of the fix for bug 2204255