Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev

author Wale Ogunwale <ogunwale@google.com>

Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)

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

Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)
author Wale Ogunwale <ogunwale@google.com>
Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)
diff --cc res/xml/development_prefs.xml
Simple merge
diff --cc src/com/android/settings/DevelopmentSettings.java
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 Feb 2016 02:27:14 +0000 (02:27 +0000)
		1	2
res/xml/development_prefs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DevelopmentSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history