Merge "Initial changes to synchronously load workspace on rotation."

author Winson Chung <winsonc@google.com>

Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)

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

Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)
author Winson Chung <winsonc@google.com>
Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)
diff --cc src/com/android/launcher2/LauncherModel.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)