tree 577617fea6d8e4c1b1961104d0916c6431a09854
parent 1550ec60402ae915d227a4ea70e2b42d3bacf901
parent 1c35d178cba11a97ec8184d30673c84acb691624
author Evan Millar <emillar@google.com> 1253322967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253322967 -0700

am 1c35d178: am 95ebd3bd: Merge change 25847 into eclair

Merge commit '1c35d178cba11a97ec8184d30673c84acb691624'

* commit '1c35d178cba11a97ec8184d30673c84acb691624':
  Fix http://b/issue?id=2099487