tree 98fcb9a69d322781bf9e1c3e6ea859de326957bb
parent b358f813c93ac0d6c4f31058947efd16b188cd1e
parent d83ebf9270e90d9306ad4eaf6837dea91ca3b172
author Chris Wren <cwren@android.com> 1397674105 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397674105 +0000

am d83ebf92: (-s ours) DO NOT MERGE disable launcher restore for 3.4 launch.

* commit 'd83ebf9270e90d9306ad4eaf6837dea91ca3b172':
  DO NOT MERGE disable launcher restore for 3.4 launch.