Merge "Disassociate system windows from apps" into lmp-dev

author Craig Mautner <cmautner@google.com>

Wed, 13 Aug 2014 18:06:18 +0000 (18:06 +0000)

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

Tue, 12 Aug 2014 23:14:35 +0000 (23:14 +0000)
author Craig Mautner <cmautner@google.com>
Wed, 13 Aug 2014 18:06:18 +0000 (18:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 Aug 2014 23:14:35 +0000 (23:14 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Wed, 13 Aug 2014 18:06:18 +0000 (18:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 Aug 2014 23:14:35 +0000 (23:14 +0000)