tree 2911d2daccf452bb51d5714dd62e387289b14fbf
parent c364caafce7a0f82852b2d8b8aa964193787c251
parent c7163ebd0377d6d1d765eb16d5bf08c962bd91fa
author Tony Wickham <twickham@google.com> 1468439796 +0000
committer android-build-merger <android-build-merger@google.com> 1468439796 +0000

Merge \"Close the shortcuts container in various places.\" into ub-launcher3-calgary
am: c7163ebd03

Change-Id: I2df7ed450b8aefa51cc90434486a82fc590fc899