tree 9568199851726991b125c603e28b2ba3ec64d83e
parent d4d2bece50c822ea6a0b2b100a945c14a6c0e89c
parent dc9c125236c9eab434b7c909d18f748c645c8118
author Chris Wren <cwren@android.com> 1389711731 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389711731 -0800

am dc9c1252: Merge "hide launcher restore behind a flag." into jb-ub-now-kermit

* commit 'dc9c125236c9eab434b7c909d18f748c645c8118':
  hide launcher restore behind a flag.