tree b33d1a74e2a3139a6e05d576d587186df6bbbe33
parent 6f1118a9199972bbf5ffb9776222f5e1c3576203
author Tony Wickham <twickham@google.com> 1496959966 +0000
committer Tony Wickham <twickham@google.com> 1496959966 +0000

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

Change-Id: I85dc9f76f21ebbe156ef68bcb5a11c28c8d871ba