tree 783bc0c6b66328ac9ae1cefdc187b33553073b5d
parent 803fe9da4d1de48819baf74197a12775a6cf0f2a
parent e1ee42c588fd0c9973600dde917779f530e1ff92
author Sunny Goyal <sunnygoyal@google.com> 1500920496 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1500920496 -0700

Merge commit 'refs/changes/78/2581578/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-6a8d73db-af6d-4463-a587-dbe10787f8df

Change-Id: I4914cc6c6b263a4a555b563791d040c3d399ce2d