tree 1ab0c9ef54ed85630775b0aa082a915f5e31c597
parent 697d0159c6cd98ff127d32f9f6c5b7edb87dda09
parent d3e669b9ae89345ef94d828a39f638717df39456
author Sunny Goyal <sunnygoyal@google.com> 1500487809 +0000
committer Sunny Goyal <sunnygoyal@google.com> 1500487809 +0000

Merge commit 'refs/changes/98/2553198/2' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-948a617f-f892-4399-bd5c-3dd472692cca am: d3e669b9ae

Change-Id: I65bca6b78210297fec8e361c54b5f5320e4831ac