tree ec11041d82c630aadadf8e0450b0bee1ea427e04
parent 44207bb6eac2de8842411abf4b0097d4e8847990
parent 629a67c5ac33409ebccf13284505a4cadc65656a
author Tony <twickham@google.com> 1496453140 -0700
committer Tony <twickham@google.com> 1496453403 -0700

Merge commit 'refs/changes/16/2352216/4' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-703609c5-a335-4a37-9002-1680d054b324

Change-Id: I5db0565024786f6476821f11954f30538a7a4cdc