tree 86084f2d56858a47da9d74c68c3c6f89352595ae
parent 4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3
parent b641abf677a291b3d77572657abe4aee19383447
author Android (Google) Code Review <android-gerrit@google.com> 1253201028 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1253201028 -0400

Merge change 25401 into eclair

* changes:
  Add a null checking to avoid crash.