Merge "DO NOT MERGE - Display mode switches." into mnc-dev

author P.Y. Laligand <pylaligand@google.com>

Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)

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

Tue, 12 May 2015 17:39:57 +0000 (17:39 +0000)
author P.Y. Laligand <pylaligand@google.com>
Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 17:39:57 +0000 (17:39 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	P.Y. Laligand <pylaligand@google.com>
	Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 May 2015 17:39:57 +0000 (17:39 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history