Merge "API for overlaying app content over decor caption in freeform windows."

author Filip Gruszczynski <gruszczy@google.com>

Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)

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

Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)
author Filip Gruszczynski <gruszczy@google.com>
Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Filip Gruszczynski <gruszczy@google.com>
	Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history