Merge "Update currentConfig variable when active display is changed." into lmp-dev

author Michael Lentine <mlentine@google.com>

Fri, 22 Aug 2014 16:34:13 +0000 (16:34 +0000)

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

Fri, 22 Aug 2014 16:34:14 +0000 (16:34 +0000)
author Michael Lentine <mlentine@google.com>
Fri, 22 Aug 2014 16:34:13 +0000 (16:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Aug 2014 16:34:14 +0000 (16:34 +0000)
diff --cc services/surfaceflinger/DisplayHardware/HWComposer.cpp
Simple merge
author	Michael Lentine <mlentine@google.com>
	Fri, 22 Aug 2014 16:34:13 +0000 (16:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Aug 2014 16:34:14 +0000 (16:34 +0000)