Merge "Ignore certain WindowManager flags when touch exploration is enabled" into...

author Alan Viverette <alanv@google.com>

Tue, 8 Oct 2013 00:47:22 +0000 (00:47 +0000)

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

Tue, 8 Oct 2013 00:47:23 +0000 (00:47 +0000)
author Alan Viverette <alanv@google.com>
Tue, 8 Oct 2013 00:47:22 +0000 (00:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 8 Oct 2013 00:47:23 +0000 (00:47 +0000)
diff --cc services/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Alan Viverette <alanv@google.com>
	Tue, 8 Oct 2013 00:47:22 +0000 (00:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 8 Oct 2013 00:47:23 +0000 (00:47 +0000)