tree 61f255947289ae06ed215d071134e39b12b41429
parent b3c720436b61f446a70e8c12f181e648ef7372fc
parent e25c5d1c94949044c4cd7416f60ea0dc12dadc8d
author Adam Cohen <adamcohen@google.com> 1403116368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403116368 +0000

am e25c5d1c: Prevent discordant state between Workspace and Launcher (issue 15409018)

* commit 'e25c5d1c94949044c4cd7416f60ea0dc12dadc8d':
  Prevent discordant state between Workspace and Launcher (issue 15409018)