Merge "Floating toolbars: Add content rect related methods to API"

author Clara Bayarri <clarabayarri@google.com>

Tue, 17 Mar 2015 15:43:50 +0000 (15:43 +0000)

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

Tue, 17 Mar 2015 15:43:51 +0000 (15:43 +0000)
author Clara Bayarri <clarabayarri@google.com>
Tue, 17 Mar 2015 15:43:50 +0000 (15:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 Mar 2015 15:43:51 +0000 (15:43 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/view/PhoneWindow.java
Simple merge
author	Clara Bayarri <clarabayarri@google.com>
	Tue, 17 Mar 2015 15:43:50 +0000 (15:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 Mar 2015 15:43:51 +0000 (15:43 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/PhoneWindow.java	patch \|	diff1 \|	diff2 \|	blob \| history