tree 98fcb9a69d322781bf9e1c3e6ea859de326957bb
parent ec46e503b03b180ebd3a20d582f02a5c1e55e212
parent 04b0d0368892f226337adae6e82677cb2b6c64ee
author Chris Wren <cwren@android.com> 1397674305 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397674305 +0000

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

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