tree c028bfe537607823c37e2ffc8c713c73059d3130
parent a8a49326cdf1fe9e2a00680d6f790d54b24bb847
parent f6e5b0c54f700c4bccec577d1549204ca7adc760
author Sunny Goyal <sunnygoyal@google.com> 1422685374 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685374 +0000

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

* commit 'f6e5b0c54f700c4bccec577d1549204ca7adc760':