tree b33d1a74e2a3139a6e05d576d587186df6bbbe33
parent 0245690671e204005c36685697fee6e612e5aa0c
author Tony Wickham <twickham@google.com> 1496953791 -0700
committer Tony Wickham <twickham@google.com> 1496955637 +0000

Merge commit 'refs/changes/42/2374342/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into dots-color

Change-Id: I85d3d443fcdc4f738da7040178eaab01dd881856