tree 6164c16a6158066e40e9dff21a183bd28f662d14
parent 235ca57a64a377c15569c318d59aa35b7963f8a6
parent d1c277e9b10a817afddb5b53583b3a21d7c2b792
author Mark Wagner <mxw@google.com> 1258502712 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258502712 -0800

am 0e3fccf1: Merge change Icef599ec into eclair-mr2

Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp

* commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1':
  null check