tree f0e16d8803b338803ece84c99750589f52d82862
parent 4808aa6b42ff31aa792b6dc0601bd6f24a554e21
parent 4b171361ca4ef2d88cd9493c6d92bb390df45289
author Chris Wren <cwren@android.com> 1389711523 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389711523 +0000

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