tree c3ee51f35f014825e04f6dc097954d39bf9b1442
parent cd44bf9c7ae89edcf906451e162d096cf3d7e561
parent 55744530222288c79a5e1aa61b65f7f6b2262fab
author Jean-Baptiste Queru <jbq@google.com> 1288054789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288054789 -0700

am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp

Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'

* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
  frameworks/base: Handle null from topRunningNonDelayedActivityLocked