tree 76fe07f3a56c736cdf3d5d9af2664c83929b03aa
parent 58ddf36f1ad526c94c065c403dadd65dfcd360d0
parent 3b7c865e04216ac22e9bd6778f307c5a6b8d4171
author Tony Wickham <twickham@google.com> 1501805247 +0000
committer Tony Wickham <twickham@google.com> 1501805247 +0000

[automerger] Merge commit 'refs/changes/84/2659484/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-860fd7dd-f3a3-4500-8fc2-78d473322b94 am: 3b7c865e04

Change-Id: I2de03214f2208d2af4c61b453e454a86aacc0159