tree f8f94405f13f2d3c9fdf4cf4021f617b99583c31
parent 2532dba74a0de4558e1cb22bee1d636d95ff1d08
parent e4a29ba9b6e04a0e708d3653ecba927968d8da59
author Wei Huang <weih@google.com> 1318944630 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318944630 -0700

am e4a29ba9: Merge "Fix the NPE in onPause()." into ics-mr0

* commit 'e4a29ba9b6e04a0e708d3653ecba927968d8da59':
  Fix the NPE in onPause().