tree 4ff7198df257f3a36c5c5b6a522aab186600e6e7
parent 5702f372a016128cd60edd24501c82e2b2ce1be8
parent 10d03955def60ffa28717cd113c74a18219e2e81
author Sunny Goyal <sunnygoyal@google.com> 1422666558 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666558 +0000

am 10d03955: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop

* commit '10d03955def60ffa28717cd113c74a18219e2e81':