tree c42485359c8fe9a88e2d46fafb0c3adb69438cec
parent 12d88b11787eba601de52cab7de1a15fdd609e77
parent 5cc7bbdbb3cdce3040d2a4f091a4543c2d469579
author Sunny Goyal <sunnygoyal@google.com> 1497291616 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1497291616 -0700

Merge commit 'refs/changes/47/2394847/4' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-5eee1265-440d-4109-93c9-46ee7ae611fc

Change-Id: I2cedaed575c90aae3684769ce6621fe68b9f06b3