Merge "DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode"

author Adrian Roos <roosa@google.com>

Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)

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

Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)
author Adrian Roos <roosa@google.com>
Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/view/WindowManager.java
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Adrian Roos <roosa@google.com>
	Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 1 Mar 2018 13:57:22 +0000 (13:57 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/WindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history