tree 31d8f75857fdc485d7f93604f873b8623d7caacd
parent d668dfb497f1e0bb31f9cd0337cf3be0a2a5b888
parent add78abb98391ccd74b96e1e4d312e3c89fe0eba
author Sunny Goyal <sunnygoyal@google.com> 1473370896 +0000
committer android-build-merger <android-build-merger@google.com> 1473370896 +0000

Merge "Launcher restore state fixes:" into ub-launcher3-calgary-polish
am: add78abb98

Change-Id: Ib1b5e20228098cc4a09e4e547faf3c69e4119261