am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to...
am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '55744530'
* commit '55744530':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked