Merge "Add null check when determining mOnTopOfHome" into klp-dev

author Craig Mautner <cmautner@google.com>

Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)
author Craig Mautner <cmautner@google.com>
Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)
diff --cc services/java/com/android/server/am/ActivityStack.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 14 Oct 2013 16:38:48 +0000 (16:38 +0000)