tree 04cb84065111e87ee896e2b56a6301043a2bc940
parent bd15704d42dea8e327fe0071a9a454e409680cf9
parent cd2a5a15c0ff9df4e25056373202a235517d6427
author Sunny Goyal <sunnygoyal@google.com> 1422669742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669742 +0000

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

* commit 'cd2a5a15c0ff9df4e25056373202a235517d6427':